summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "LayoutLib: fix some tests"Xavier Ducrohet2010-11-192-3/+7
|\
| * LayoutLib: fix some testsXavier Ducrohet2010-11-192-3/+7
| | | | | | | | Change-Id: Iacd641e2fac663ff12fe2a08ba093c4eaa2e8862
* | Merge "CameraBrowser improvements:"Mike Lockwood2010-11-197-73/+116
|\ \ | |/ |/|
| * CameraBrowser improvements:Mike Lockwood2010-11-197-73/+116
| | | | | | | | | | | | | | | | | | Replace menu for importing and deleting files with buttons. Automatically close activities when camera is disconnected. Change-Id: I88351e7c337c796057ce3f7da46fc287305f2220 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Merge "Fix AbsListView StrictMode.Span end point on flings."Brad Fitzpatrick2010-11-191-5/+5
|\ \
| * | Fix AbsListView StrictMode.Span end point on flings.Brad Fitzpatrick2010-11-191-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Noticed after logs showed a ton of false positives, I went back and looked at the history. During the review of the previous CL, I accidentally moved the finish() of the fling animation tracking inside the PROFILE_FLINGING block, which is normally off. Re-tested this CL with StrictMode debugging enabled and it now always propertly resets to 0 animations in flight when no animations are running. Change-Id: Ie9746df36e2ec3f82679b20e91e3d93c05b863d4
* | | Merge "Improve hide/show animations in status bar."Daniel Sandler2010-11-192-117/+158
|\ \ \
| * | | Improve hide/show animations in status bar.Daniel Sandler2010-11-192-117/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cleans up the lights out experience so you can clearly see that the "shadows" along the bottom of the bar correspond to invisible (but still available) UI elements. Bug: 3203171 Change-Id: I635394d625bf97bbbe7260c1ae9320b616ea7aec
* | | | Merge "Layoutlib: support viewkey in include nodes."Xavier Ducrohet2010-11-193-44/+69
|\ \ \ \
| * | | | Layoutlib: support viewkey in include nodes.Xavier Ducrohet2010-11-183-44/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an include tag is parsed, the custom bridge code never has access to both parsers at the same time. The child parser is created out of an in (representing the layout id), and the code inflating the content of the include layout doesn't see the parent parser either. This changeset adds a parser stack in the BridgeContext in order to allow access to the parent parser when setting the viewkey. This is only used if the current parser depth is 1 (top node), as we only want to set the include node to the top node of the included layout. Change-Id: I2ac3b72a0c84a269d9019f44f98cbc0b615ab959
* | | | | Merge branch 'master' of ssh://android-git:29418/platform/frameworks/baseAndroid Git Automerger2010-11-196-36/+52
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "StrictMode: use Log.isLoggable"Brad Fitzpatrick2010-11-191-1/+1
| |\ \ \ \
| | * | | | StrictMode: use Log.isLoggableBrad Fitzpatrick2010-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic28450066a43a168cfe3026d6d4b06b752f8423c
| * | | | | Merge "Clean-up in StaticLayout"Gilles Debunne2010-11-191-6/+13
| |\ \ \ \ \
| | * | | | | Clean-up in StaticLayoutGilles Debunne2010-11-191-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I81ac5d8bef7ce8f4f65e3a8c7da8393ce0a87558
| * | | | | | Merge "PTP: Fix permissions problems with files imported via PTP"Mike Lockwood2010-11-193-4/+13
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | PTP: Fix permissions problems with files imported via PTPMike Lockwood2010-11-193-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I630a89c67e5b3d6d0c29e6c257f84e1909fa4de2 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | | | | Merge "Removing logs of text that is being spoken."Charles Chen2010-11-191-25/+25
| |\ \ \ \ \ \
| | * | | | | | Removing logs of text that is being spoken.Charles Chen2010-11-191-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I12624e51eb093b6ee464fc11275046a9e5100925
* | | | | | | | am 00f502a3: am 0e29064d: Merge "Doc change: update media formats table." ↵Dirk Dougherty2010-11-191-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread * commit '00f502a38cc4d6e2278f962b04308e6590dba36b': Doc change: update media formats table.
| * | | | | | | am 0e29064d: Merge "Doc change: update media formats table." into gingerbreadDirk Dougherty2010-11-191-3/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e29064d1caad7b82aa76876e7e2f4c86ded06d2': Doc change: update media formats table.
| | * \ \ \ \ \ \ Merge "Doc change: update media formats table." into gingerbreadDirk Dougherty2010-11-191-3/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | Doc change: update media formats table.Dirk Dougherty2010-11-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0a39fed18f7b2d42fc7690ead230b1861332bd4e
* | | | | | | | | | Merge "Notify all VMs when proxy changes."Robert Greenwalt2010-11-1915-302/+498
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Notify all VMs when proxy changes.Robert Greenwalt2010-11-1915-302/+498
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:2700664 Change-Id: I74cc6e0bd6e66847bf18f524ce851e3e9d2c4e87
* | | | | | | | | | Merge "Fix an artifact of going from off_t to off64_t"Andreas Huber2010-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix an artifact of going from off_t to off64_tAndreas Huber2010-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I999fb60a290f9b2db5b73bf926392c8f4e1b7829
* | | | | | | | | | | am 096c4c44: am 251384a7: Merge "Improve performance when getting styled ↵Brad Fitzpatrick2010-11-192-48/+53
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | string." * commit '096c4c448d8110c21108f2db4a19a85099e78557': Improve performance when getting styled string.
| * | | | | | | | | | am 251384a7: Merge "Improve performance when getting styled string."Brad Fitzpatrick2010-11-192-48/+53
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '251384a7595022ddbc53f4ab0fa386f9c040f1f5': Improve performance when getting styled string.
| | * \ \ \ \ \ \ \ \ \ Merge "Improve performance when getting styled string."Brad Fitzpatrick2010-11-192-48/+53
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Improve performance when getting styled string.Peter Eliasson2010-11-182-48/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The style used in the composing text for input methods takes a long time to create. This is experienced as a lag when composing the first word. The bottleneck lies in the 10 calls to nativeIndexOfString which does a linear search through thousands of strings. Change-Id: I3184b2be3673d384cca19e9a70ad94b4d3085576
* | | | | | | | | | | | | am f69f356e: am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: ↵Jean-Baptiste Queru2010-11-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* inste * commit 'f69f356ebaf33aa150817c44ee2bd781f24e4e71': build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
| * | | | | | | | | | | | am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: ↵Jean-Baptiste Queru2010-11-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*" * commit '14ac9546367d4df37eead55f6762b944b49f33b2': build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
| | * | | | | | | | | | | Merge "build failed with g++ v. 4.4.5 err msg: ↵Jean-Baptiste Queru2010-11-171-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*"
| | | * | | | | | | | | | | build failed with g++ v. 4.4.5Matthias Bady2010-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char* Change-Id: I6442ee642aebfbfc2f977bab40016cfedc7789ac
* | | | | | | | | | | | | | Merge "docs: de-'new' samples and tutorials"Scott Main2010-11-191-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | docs: de-'new' samples and tutorialsScott Main2010-11-191-7/+7
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I49cbabcb1f3a915259588bc98b05a9d702f5eb2d
* | | | | | | | | | | | | | Merge "Remove command line mtp host tool"Mike Lockwood2010-11-194-655/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Remove command line mtp host toolMike Lockwood2010-11-194-655/+0
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't need this any more, and don't have time to finish nor maintain it. Change-Id: I35c5d003e1ad163d429832eb1d0c8d880058c7f1 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | | | Merge "Split SupplicantStateTracker and refactor"Irfan Sheriff2010-11-192-515/+513
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Split SupplicantStateTracker and refactorIrfan Sheriff2010-11-182-515/+513
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move SupplicantStateTracker into a seperate file. In the process clean up code that needs to be present only in SupplicantStateTracker - Retry twice for password failures - Clean up supplicant state handling. Dont treat supplicant states as HSM what values. Instead, just retain SUPPLICANT_STATE_CHANGE - Add event logging in SupplicantStateTracker - Move scan handling out SupplicantStateTracker Change-Id: I083e1c40ef5a858164493b1440b82c5751b3bfb5
* | | | | | | | | | | | | Merge "Squashed commit of the following:"Andreas Huber2010-11-197-168/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Squashed commit of the following:Andreas Huber2010-11-197-168/+27
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 610ed879d57785cb0457f7f127889496d325f732 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 09:28:52 2010 -0800 HTTP header keys are to be treated case insensitive. Change-Id: I9690880528a6b0f611958de7996c2753948a03c3 commit 554a2499a293d8d53907d01d972a9cfe9b92738e Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 09:22:45 2010 -0800 Remove one more legacy "string" implementation. Change-Id: I7638d849427a39bbc040082a8663b3b9b81a632b Change-Id: I626a60abdcd1dd6403be880dad4d0499d77ca71f
* | | | | | | | | | | | | Merge "Use different version of CLDR data in DatePicker"Kenny Root2010-11-191-6/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use different version of CLDR data in DatePickerKenny Root2010-11-151-6/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ICU CLDR data doesn't use the month abbreviations that are appropriate for the DatePicker, so use the framework copy of the CLDR data. Bug: 2641810 Change-Id: Ic0f7b461b43c76dfa3f8b73a9479b79df230d7bd
* | | | | | | | | | | | | | Merge "new docs for fragments"Scott Main2010-11-196-2/+660
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | new docs for fragmentsScott Main2010-11-186-2/+660
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia21a4c844d475a743399d25dfe43f916d423258c
* | | | | | | | | | | | | | | Merge "Update screen timeout again."Amith Yamasani2010-11-191-14/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Update screen timeout again.Amith Yamasani2010-11-181-14/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3165933
* | | | | | | | | | | | | | | Merge "PTP: Improve performance and reliability of file importing"Mike Lockwood2010-11-1911-250/+146
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-01-26 04:33:01 +0000