Jim Miller
f5eaee96b0
am c8212613: am 99dcfe7c: am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
2010-05-11 10:28:06 -07:00
Jim Miller
c821261345
am 99dcfe7c: am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
2010-05-11 10:26:00 -07:00
Jim Miller
99dcfe7cda
am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
...
Merge commit '4d89954dc4572a05339dc7a95ec683892558162b' into kraken
* commit '4d89954dc4572a05339dc7a95ec683892558162b':
Fix 2660488: Add LockScreen/InCallScreen resources to preloads
2010-05-11 10:23:42 -07:00
Jim Miller
4d89954dc4
am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
...
Merge commit 'a27579016caf1438400a3637e3896bec653e3756' into froyo-plus-aosp
* commit 'a27579016caf1438400a3637e3896bec653e3756':
Fix 2660488: Add LockScreen/InCallScreen resources to preloads
2010-05-11 10:18:38 -07:00
Robert Greenwalt
7819e1d72c
Merge "Fix throttle datafile parsing."
2010-05-11 07:38:52 -07:00
Robert Greenwalt
9e3983fbde
Fix throttle datafile parsing.
...
"Optimization" yesterday was buggy.
bug:2674511
Change-Id: I3b1dde35a75b2017117c20905fcd82de405d41b5
2010-05-11 07:31:42 -07:00
Steve Block
52ab0b39fc
Merge webkit.org at r58033 : Update the WebKit UA string and LayoutTest ignore list
...
Change-Id: I620e6da3f7318f329f3401075799e5659cacda82
2010-05-11 14:28:10 +01:00
Mike Lockwood
31ac8e9d56
Add new permission android.permission.ACCESS_USB to allow access to USB devices
...
Change-Id: Ib3dd573a5ef3950d20b21251fe7a3efad56b5c1f
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-05-11 08:29:19 -04:00
Bjorn Bringert
91882c4731
Merge "Added definitions for the ways in which VoiceIME can be started."
2010-05-11 03:23:02 -07:00
Wu-cheng Li
f0b8679b5d
am 0c3bba3e: am e1b2b3b0: Merge "Add continuous focus mode constant." into kraken
2010-05-10 20:07:54 -07:00
Wu-cheng Li
0c3bba3ee5
am e1b2b3b0: Merge "Add continuous focus mode constant." into kraken
2010-05-10 20:06:04 -07:00
Wu-cheng Li
e1b2b3b0d2
Merge "Add continuous focus mode constant." into kraken
2010-05-10 20:04:14 -07:00
Konstantin Lopyrev
6707341b28
Fixing bug 2660263, changed text for PIN unlock
...
Change-Id: I904c7c4753b68195fbd547e97207aa3cceef3c6d
2010-05-10 18:02:31 -07:00
Robert Greenwalt
24488bd094
Fix build. Instantiate object before use.
...
bug:2673562
Change-Id: I1e39f7847c25c5c1923a7b7e864b402c94834528
2010-05-10 17:02:55 -07:00
Nicolas Roard
46318cf9bf
Fix the 'wobbling fixed elements' bug.
...
This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149 )
Bug:2665696
Change-Id: I28516005d03afa866efed2677197120ac6e2d579
2010-05-10 16:35:52 -07:00
Jim Miller
a27579016c
Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
2010-05-10 15:55:41 -07:00
Jim Miller
7d38886ba6
Fix 2660488: Add LockScreen/InCallScreen resources to preloads
...
This adds the base SlidinTab drawable resources shared by
InCallScreen and LockScreen into the zygote process. It should
save approximately 375kB (mdpi) and 825kB (hdpi) of RAM by
sharing resource between the LockScreen and InCallScreen.
Change-Id: I05bcafa894ed27d419b171ad5041bd83134461f7
2010-05-10 15:24:47 -07:00
Robert Greenwalt
0674cfbca3
Merge "Reduce lock contention"
2010-05-10 14:12:28 -07:00
The Android Open Source Project
ba6b4ee862
am 904d911f: am e88ae544: am b6f0cbdc: merge from open-source master
2010-05-10 13:54:14 -07:00
Robert Greenwalt
39e163f45a
Reduce lock contention
...
Reduce the amount of work done inside of synchronized blocks and
force the use of cached ntp data when publicly called.
bug:2662331
Change-Id: Ibafd29ea9e355fa8f875d06ce37870b0c01c57f4
2010-05-10 13:52:32 -07:00
The Android Open Source Project
904d911f5f
am e88ae544: am b6f0cbdc: merge from open-source master
2010-05-10 13:52:03 -07:00
The Android Open Source Project
e88ae544e3
am b6f0cbdc: merge from open-source master
...
Merge commit 'b6f0cbdcbb566368ebe0468f61de024f644db6e1' into kraken
* commit 'b6f0cbdcbb566368ebe0468f61de024f644db6e1':
Include the API level 4 fields in the Parcel.
2010-05-10 13:50:32 -07:00
The Android Open Source Project
b6f0cbdcbb
merge from open-source master
...
Change-Id: Ia4cbea9d94b2ff34fc8ce97c1fe35ca5898d6c1c
2010-05-10 13:48:37 -07:00
The Android Open Source Project
a7b01969f6
am cee6300c: am 38a410f1: am 686d9ff5: merge from open-source master
2010-05-10 12:56:46 -07:00
The Android Open Source Project
cee6300cf1
am 38a410f1: am 686d9ff5: merge from open-source master
2010-05-10 12:54:45 -07:00
The Android Open Source Project
38a410f12a
am 686d9ff5: merge from open-source master
...
Merge commit '686d9ff53c32ded9b2b02eb9f2040f2030846e51' into kraken
* commit '686d9ff53c32ded9b2b02eb9f2040f2030846e51':
Use isLocationProviderEnabled to test for enabled providers
Added WEB_URL_PATTERN for Montenegro ".me"
long modifier was on the wrong argument.
2010-05-10 12:53:28 -07:00
The Android Open Source Project
686d9ff53c
merge from open-source master
...
Change-Id: Ic2b28b589d079cf3c9927ce9ad22bc5f9134e445
2010-05-10 12:37:10 -07:00
James Dong
76017b809f
am 98bb3eeb: am 4000e06e: Merge "Metadata construction optimization" into kraken
2010-05-10 11:37:00 -07:00
James Dong
98bb3eeb46
am 4000e06e: Merge "Metadata construction optimization" into kraken
2010-05-10 11:34:49 -07:00
James Dong
4000e06ef6
Merge "Metadata construction optimization" into kraken
2010-05-10 11:33:25 -07:00
Jean-Baptiste Queru
855a9e6d12
Merge "Include the API level 4 fields in the Parcel."
2010-05-10 11:14:01 -07:00
Robert Greenwalt
858510ca40
am 8ada6786: am da7bf206: am c8d1556f: am b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo
2010-05-10 10:18:37 -07:00
Robert Greenwalt
8ada678695
am da7bf206: am c8d1556f: am b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo
2010-05-10 10:17:13 -07:00
Robert Greenwalt
da7bf20608
am c8d1556f: am b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo
...
Merge commit 'c8d1556fb8e78dc6cecc8dc52f2bf0e093c968f4' into kraken
* commit 'c8d1556fb8e78dc6cecc8dc52f2bf0e093c968f4':
String change to refer to wifi tether as hotspot
2010-05-10 10:14:51 -07:00
Robert Greenwalt
c8d1556fb8
am b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo
...
Merge commit 'b74a239fd2e729c41b0cb87cbc606530ed631a41' into froyo-plus-aosp
* commit 'b74a239fd2e729c41b0cb87cbc606530ed631a41':
String change to refer to wifi tether as hotspot
2010-05-10 10:12:58 -07:00
Robert Greenwalt
b74a239fd2
Merge "String change to refer to wifi tether as hotspot" into froyo
2010-05-10 10:11:12 -07:00
Scott Main
e128d67264
am cd2fa84a: am 9d5b754b: am 717e135c: am 62c28cae: Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo
2010-05-10 10:02:20 -07:00
Scott Main
cd2fa84a7f
am 9d5b754b: am 717e135c: am 62c28cae: Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo
2010-05-10 10:00:30 -07:00
Scott Main
9d5b754bce
am 717e135c: am 62c28cae: Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo
...
Merge commit '717e135c17239ff3dd0698eb82b26f8e8ade0d08' into kraken
* commit '717e135c17239ff3dd0698eb82b26f8e8ade0d08':
docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc
2010-05-10 09:58:30 -07:00
Scott Main
717e135c17
am 62c28cae: Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo
...
Merge commit '62c28caee4a26e106134264f917bacef77438483' into froyo-plus-aosp
* commit '62c28caee4a26e106134264f917bacef77438483':
docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc
2010-05-10 09:56:43 -07:00
Dan Egnor
07704f1f66
am 6bff8df8: am 1a373db0: am 5610c287: am 7d167376: Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo
2010-05-10 09:56:41 -07:00
Dirk Dougherty
4e664773be
am 90d35cba: am 31e4f45e: am e4682e8a: am fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo
2010-05-10 09:56:30 -07:00
Scott Main
ba1d1060dd
am 41f6d916: am 25d24061: am fe5921aa: am c4c42eef: docs: add default value and compatibility info for installLocation
2010-05-10 09:56:25 -07:00
Scott Main
d98da9cfbb
am 2e9ec96d: am 3d3853a6: am d2f2a80e: am c6cb8a78: docs: revisions to the new resources doc based on editorial feedback plus some fixes to resource references and other misc revisions
2010-05-10 09:56:19 -07:00
Andreas Huber
6aa19bb7d2
am 23796f1e: am 248597ae: am 17078510: am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo
2010-05-10 09:56:11 -07:00
Mathias Agopian
5705a886c6
am ef474f3f: am 4cfc21ec: am 56aed6bd: am c69775d6: Merge "fix [2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo
2010-05-10 09:56:00 -07:00
Dirk Dougherty
2d498fd57e
am fe39ceff: am 47de84c3: am aff856d0: am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo
2010-05-10 09:55:54 -07:00
Scott Main
62c28caee4
Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo
2010-05-10 09:54:30 -07:00
Dan Egnor
6bff8df839
am 1a373db0: am 5610c287: am 7d167376: Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo
2010-05-10 09:54:16 -07:00
Dirk Dougherty
90d35cba61
am 31e4f45e: am e4682e8a: am fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo
2010-05-10 09:54:11 -07:00