Makoto Onuki
3f6e4d56bb
am 1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP" into gingerbread
...
Merge commit '1cc86da61a361c84ef81e893440c500e33fae312' into gingerbread-plus-aosp
* commit '1cc86da61a361c84ef81e893440c500e33fae312':
Don't fall through from TOKEN_EMAIL_LOOKUP
2010-09-07 14:34:19 -07:00
Makoto Onuki
1cc86da61a
Merge "Don't fall through from TOKEN_EMAIL_LOOKUP" into gingerbread
2010-09-07 14:31:34 -07:00
Dianne Hackborn
75f0024cf4
am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbread
...
Merge commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026' into gingerbread-plus-aosp
* commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026':
Fixes to battery stats debug output.
2010-09-07 14:15:17 -07:00
Dianne Hackborn
b5e3165129
Fixes to battery stats debug output.
...
Change-Id: I32e7cad9633b8c517a74573069e426d9f835a83d
2010-09-07 14:09:36 -07:00
Dianne Hackborn
b8bcfed552
am f703b77c: Merge "Add system property to turn off scheduling groups." into gingerbread
...
Merge commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7' into gingerbread-plus-aosp
* commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7':
Add system property to turn off scheduling groups.
2010-09-07 11:30:08 -07:00
Dianne Hackborn
f703b77c96
Merge "Add system property to turn off scheduling groups." into gingerbread
2010-09-07 11:27:26 -07:00
Dianne Hackborn
84bb52ed61
Add system property to turn off scheduling groups.
...
Do this:
adb shell setprop debug.sys.noschedgroups 1
Change-Id: I6e06a74205fd45ee1526ce71fe33944465d39984
2010-09-07 11:19:11 -07:00
Brad Fitzpatrick
c19c9e4ee2
am b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread
...
Merge commit 'b1104b3713febb75164938a465c3022e1879245f' into gingerbread-plus-aosp
* commit 'b1104b3713febb75164938a465c3022e1879245f':
Make SharedPreferencesBackupHelper wait for async SharedPreference writes
2010-09-07 11:15:01 -07:00
Brad Fitzpatrick
b1104b3713
Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread
2010-09-07 11:12:51 -07:00
Eric Fischer
aab7375799
am 745e751b: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
...
Merge commit '745e751b251baa38e94dfce1fe264574d0204cc2' into gingerbread-plus-aosp
* commit '745e751b251baa38e94dfce1fe264574d0204cc2':
Preserve old translations for changed strings. DO NOT MERGE
2010-09-07 11:08:19 -07:00
Eric Fischer
745e751b25
Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
2010-09-07 11:03:26 -07:00
Kenny Root
f17bd19acb
am 2cb3e836: Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread
...
Merge commit '2cb3e83654c99e202c170d9d0237d8d1f4054354' into gingerbread-plus-aosp
* commit '2cb3e83654c99e202c170d9d0237d8d1f4054354':
Use new nativeLibraryPath field for NativeActivity
2010-09-07 10:49:22 -07:00
Makoto Onuki
a362e1d794
Don't fall through from TOKEN_EMAIL_LOOKUP
...
Change-Id: Ifc08f26ba93496cfa53cd83c7df0e986ea4ece4b
2010-09-07 10:46:59 -07:00
Kenny Root
2cb3e83654
Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread
2010-09-07 10:46:14 -07:00
Kenny Root
6798b62e92
Use new nativeLibraryPath field for NativeActivity
...
Instead of being naughty and guessing the native library path from
dataDir, use the new nativeLibraryPath field because it can be on SD
card now.
Change-Id: I284bde42e0b0114366e412eb7212af22b47208d8
2010-09-07 10:44:21 -07:00
Brad Fitzpatrick
6f9d58ac62
Make SharedPreferencesBackupHelper wait for async SharedPreference writes
...
Fixes a potential race with backups.
Change-Id: I73492c0384091cedd7802109257312387fcd43f9
2010-09-06 22:18:39 -07:00
Brad Fitzpatrick
32e298511a
am 612ff274: Quell annoying Java ascii/unicode warning.
...
Merge commit '612ff27425cf2976396d992f32b58ab900c7d708' into gingerbread-plus-aosp
* commit '612ff27425cf2976396d992f32b58ab900c7d708':
Quell annoying Java ascii/unicode warning.
2010-09-06 19:34:43 -07:00
Brad Fitzpatrick
612ff27425
Quell annoying Java ascii/unicode warning.
...
This fix is already in master, so just cherry-picking it here too.
Change-Id: I28c57171aa3e55933c3e98555575a074b25b2b2a
2010-09-06 19:22:09 -07:00
Kenny Root
a060b5f738
am 6dc003a7: Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread
...
Merge commit '6dc003a73f7f01aa5dd5831e777e2aa44f65b032' into gingerbread-plus-aosp
* commit '6dc003a73f7f01aa5dd5831e777e2aa44f65b032':
Reduce footprint of Signature from ~7000 to ~1448
2010-09-03 17:07:15 -07:00
Kenny Root
6dc003a73f
Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread
2010-09-03 16:59:42 -07:00
Adam Powell
0354f0cad5
am 7627c221: DO NOT MERGE Tweak overscroll
...
Merge commit '7627c221c6ce8bf433bf207b002eabe7236c4757' into gingerbread-plus-aosp
* commit '7627c221c6ce8bf433bf207b002eabe7236c4757':
DO NOT MERGE Tweak overscroll
2010-09-03 16:33:37 -07:00
Adam Powell
7627c221c6
DO NOT MERGE Tweak overscroll
...
Change-Id: I5ba00fc87ba7b286978acf577ba6461f79066437
2010-09-03 16:09:03 -07:00
Kenny Root
de0ff63700
Reduce footprint of Signature from ~7000 to ~1448
...
Signature had lazy initialization of the mString member when needed, but
it would stick around forever when initialized. Each package had one or
more Signatures that would be ~7000 bytes each. At a couple hundred
packages, that's over 1.3MB just for signatures.
Whenever packages.xml was written out, it would write the Signature for
each program as well which happens at boot thereby initializing the
mString member pretty much immediately.
Change-Id: Idb882ffeca2861b3e87437fc83f001710d6c0441
2010-09-03 16:02:27 -07:00
Dianne Hackborn
acc4e041d2
am 69717ccd: DO NOT MERGE. Some stuff that is Not Ready.
...
Merge commit '69717ccd13bb5568b912701ab39d603cfa7091cc' into gingerbread-plus-aosp
* commit '69717ccd13bb5568b912701ab39d603cfa7091cc':
DO NOT MERGE. Some stuff that is Not Ready.
2010-09-03 15:23:46 -07:00
Dianne Hackborn
69717ccd13
DO NOT MERGE. Some stuff that is Not Ready.
...
Change-Id: I8fdba32722d86b92c791dbf7c6c0166bcdb02852
2010-09-03 15:20:06 -07:00
Dianne Hackborn
6a3ffb5bee
am df3a0f50: Merge "Improve doc." into gingerbread
...
Merge commit 'df3a0f50c3480911e366c8c0781b0463fe063e82' into gingerbread-plus-aosp
* commit 'df3a0f50c3480911e366c8c0781b0463fe063e82':
Improve doc.
2010-09-03 15:18:39 -07:00
Dianne Hackborn
df3a0f50c3
Merge "Improve doc." into gingerbread
2010-09-03 15:15:50 -07:00
Dianne Hackborn
170bae7d83
Improve doc.
...
Change-Id: I841b04e1e455b6236fb8b65b965f2fc25c4461f0
2010-09-03 15:14:28 -07:00
Dianne Hackborn
fd3f44b388
am e1aa82a4: Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread
...
Merge commit 'e1aa82a4228d009537693253ba3a0113abbf5ab8' into gingerbread-plus-aosp
* commit 'e1aa82a4228d009537693253ba3a0113abbf5ab8':
Adding a feature denoting support for 5 or more fully
2010-09-03 15:10:24 -07:00
Eric Fischer
3a94b7c121
Preserve old translations for changed strings. DO NOT MERGE
...
Change-Id: I64023ad34cba22133fd355ed4d885b3f831c5aa1
2010-09-03 14:55:45 -07:00
Dan Morrill
6993d3d136
Adding a feature denoting support for 5 or more fully
...
independent multitouch pointers.
Change-Id: I9997ed9c481dbd507e9eff70d8beb9e1140cca3f
2010-09-03 14:41:36 -07:00
Adam Powell
f9a1ff4173
am e7c02ef4: Merge "Fix bug 2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread
...
Merge commit 'e7c02ef40a10c599b13684a6f99a91eabd0f258f' into gingerbread-plus-aosp
* commit 'e7c02ef40a10c599b13684a6f99a91eabd0f258f':
Fix bug 2973252 - Make overscroll glow respect ifContentScrolls
2010-09-03 14:00:41 -07:00
Adam Powell
e7c02ef40a
Merge "Fix bug 2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread
2010-09-03 13:58:37 -07:00
Dianne Hackborn
3d7d3690de
am e25b4bc7: Merge "These are not ready to be exposed. Also rename them to be better." into gingerbread
...
Merge commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99' into gingerbread-plus-aosp
* commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99':
These are not ready to be exposed. Also rename them to be better.
2010-09-03 13:26:30 -07:00
Dianne Hackborn
e25b4bc76f
Merge "These are not ready to be exposed. Also rename them to be better." into gingerbread
2010-09-03 13:24:33 -07:00
Dianne Hackborn
482566ed5c
These are not ready to be exposed. Also rename them to be better.
...
Change-Id: I7c234144497084b7769f8c46761b7d74d1c583d5
2010-09-03 12:51:28 -07:00
Brad Fitzpatrick
9eb32c96c8
am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread
...
Merge commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8' into gingerbread-plus-aosp
* commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8':
More SharedPreferences commit() -> apply() changes.
2010-09-03 12:49:44 -07:00
Adam Powell
e6ffce9f65
Fix bug 2973252 - Make overscroll glow respect ifContentScrolls
...
Change-Id: I0e4bf09c0cbc660c9b8d26a3526b09568c05e93d
2010-09-03 12:06:51 -07:00
Brad Fitzpatrick
fa8e271636
More SharedPreferences commit() -> apply() changes.
...
Change-Id: Ibc844d72d463434722a349f5bbc02889a9feb0ee
2010-09-03 11:18:28 -07:00
Gilles Debunne
ece9e19478
am d180232e: Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread
...
Merge commit 'd180232e92b78067beb7f84d7f3d1d21865f0594' into gingerbread-plus-aosp
* commit 'd180232e92b78067beb7f84d7f3d1d21865f0594':
Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"
2010-09-02 15:34:24 -07:00
Gilles Debunne
d180232e92
Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread
2010-09-02 15:29:14 -07:00
Gilles Debunne
d4723bb415
Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"
...
This reverts commit 26d708d936 , reversing
changes made to 3ac85d31de .
Change-Id: Ifc19f837bee7437707ddddf0b19cb6bce53dd2c5
2010-09-02 15:27:47 -07:00
Eric Rowe
4ca550a17b
am 947e25e5: am ac3c1f55: Add BT test instrumentation for reboot tests.
...
Merge commit '947e25e5ffe13549dab82580ef05f1f4faf42cd2' into gingerbread-plus-aosp
* commit '947e25e5ffe13549dab82580ef05f1f4faf42cd2':
Add BT test instrumentation for reboot tests.
2010-09-02 14:59:00 -07:00
Gilles Debunne
5402c34b27
am 26d708d9: Merge "InputMethodManager showSoftInput return documentation." into gingerbread
...
Merge commit '26d708d93624d2d060529b7e33e0a20172e85efd' into gingerbread-plus-aosp
* commit '26d708d93624d2d060529b7e33e0a20172e85efd':
InputMethodManager showSoftInput return documentation.
2010-09-02 14:55:51 -07:00
Eric Rowe
947e25e5ff
am ac3c1f55: Add BT test instrumentation for reboot tests.
...
Merge commit 'ac3c1f550f30aa793ccf5dcd0da55b070fd55364' into gingerbread
* commit 'ac3c1f550f30aa793ccf5dcd0da55b070fd55364':
Add BT test instrumentation for reboot tests.
2010-09-02 14:55:47 -07:00
Gilles Debunne
26d708d936
Merge "InputMethodManager showSoftInput return documentation." into gingerbread
2010-09-02 14:50:25 -07:00
Daisuke Miyakawa
fa5a46a08e
am 3010713f: Fix again.
...
Merge commit '3010713f50aa6ac189b1990421cfab1d426bc601' into gingerbread-plus-aosp
* commit '3010713f50aa6ac189b1990421cfab1d426bc601':
Fix again.
2010-09-02 13:54:48 -07:00
Daisuke Miyakawa
3010713f50
Fix again.
...
Change-Id: I7393e1e9e9aa3f8612d143840109f1c5193f692f
2010-09-02 13:48:09 -07:00
Daisuke Miyakawa
b2b973d13e
am 3bd9b8f0: Fix build breakage.
...
Merge commit '3bd9b8f04cece37ab4405abc382e2810006b9f97' into gingerbread-plus-aosp
* commit '3bd9b8f04cece37ab4405abc382e2810006b9f97':
Fix build breakage.
2010-09-02 13:46:55 -07:00
Daisuke Miyakawa
3bd9b8f04c
Fix build breakage.
...
Change-Id: If519f1730266f10a7852af209127aa4754a7ef9d
2010-09-02 13:42:22 -07:00