Dirk Dougherty
775994e12d
am c5803869: am 02168c41: am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo
2010-05-11 10:26:11 -07:00
Dirk Dougherty
2ecef59cba
am 0ab047c7: am 769612e1: am b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots.
2010-05-11 10:26: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
Dirk Dougherty
c5803869ff
am 02168c41: am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo
...
Merge commit '02168c41c444e4f601a2809d6d948e4b051b3a3e' into kraken
* commit '02168c41c444e4f601a2809d6d948e4b051b3a3e':
Doc change: Final api diffs 7 -> 8.
2010-05-11 10:23:52 -07:00
Dirk Dougherty
0ab047c732
am 769612e1: am b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots.
...
Merge commit '769612e160c9be01c96371412e12d367e5063e9f' into kraken
* commit '769612e160c9be01c96371412e12d367e5063e9f':
Doc change: add toc references to tictactoe sample apps and screen shots.
2010-05-11 10:23:48 -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
Dirk Dougherty
02168c41c4
am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo
...
Merge commit '1926c471a3acde38931f2cbd55415decc9879d2d' into froyo-plus-aosp
* commit '1926c471a3acde38931f2cbd55415decc9879d2d':
Doc change: Final api diffs 7 -> 8.
2010-05-11 10:18:51 -07:00
Dirk Dougherty
769612e160
am b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots.
...
Merge commit 'b32c2402c2b9d58b4f74be62dac6ce2781caec05' into froyo-plus-aosp
* commit 'b32c2402c2b9d58b4f74be62dac6ce2781caec05':
Doc change: add toc references to tictactoe sample apps and screen shots.
2010-05-11 10:18:47 -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
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
Dirk Dougherty
1926c471a3
Merge "Doc change: Final api diffs 7 -> 8." into froyo
2010-05-10 16:23:13 -07:00
Dirk Dougherty
b32c2402c2
Doc change: add toc references to tictactoe sample apps and screen shots.
...
Change-Id: I7d520587c0e6b2252e819029a2f053893fdcd7c3
2010-05-10 16:19: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
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
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
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
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
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
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
Scott Main
41f6d916b5
am 25d24061: am fe5921aa: am c4c42eef: docs: add default value and compatibility info for installLocation
2010-05-10 09:54:04 -07:00
Scott Main
2e9ec96d9e
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:53:59 -07:00
Andreas Huber
23796f1eb6
am 248597ae: am 17078510: am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo
2010-05-10 09:53:54 -07:00
Mathias Agopian
ef474f3fb6
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:53:48 -07:00
Dirk Dougherty
fe39ceff08
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:53:40 -07:00
Dan Egnor
1a373db021
am 5610c287: am 7d167376: Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo
...
Merge commit '5610c2871b5a8abab081c9e209925e2f0f2e3966' into kraken
* commit '5610c2871b5a8abab081c9e209925e2f0f2e3966':
Add unit test for passing thread priority & cgroup through Binder.
2010-05-10 09:49:41 -07:00
Dirk Dougherty
31e4f45eba
am e4682e8a: am fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo
...
Merge commit 'e4682e8ae75d573c12ddabce13b8b5c39011a86f' into kraken
* commit 'e4682e8ae75d573c12ddabce13b8b5c39011a86f':
Doc change: cherry-pick from master: Testing Android Applications document (concepts)
2010-05-10 09:49:37 -07:00
Scott Main
25d2406176
am fe5921aa: am c4c42eef: docs: add default value and compatibility info for installLocation
...
Merge commit 'fe5921aa7e4ed5a1de02259d4ac468b7b013fa83' into kraken
* commit 'fe5921aa7e4ed5a1de02259d4ac468b7b013fa83':
docs: add default value and compatibility info for installLocation
2010-05-10 09:49:34 -07:00
Scott Main
3d3853a618
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
...
Merge commit 'd2f2a80e9ff7f0b2229d921f24682d984e3b5673' into kraken
* commit 'd2f2a80e9ff7f0b2229d921f24682d984e3b5673':
docs: revisions to the new resources doc based on editorial feedback
2010-05-10 09:49:30 -07:00
Andreas Huber
248597ae64
am 17078510: am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo
...
Merge commit '1707851090e6512a77247b0c260dd673ef687589' into kraken
* commit '1707851090e6512a77247b0c260dd673ef687589':
A new OggExtractor/VorbisDecoder combo to support approximate seeking.
2010-05-10 09:49:24 -07:00
Mathias Agopian
4cfc21ecd9
am 56aed6bd: am c69775d6: Merge "fix [2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo
...
Merge commit '56aed6bde0c52658d2cb1207c0cfe8ba0a764c59' into kraken
* commit '56aed6bde0c52658d2cb1207c0cfe8ba0a764c59':
fix [2664345] Flash: Bad flicker at the end of a pinch zoom.
2010-05-10 09:49:19 -07:00
Dirk Dougherty
47de84c359
am aff856d0: am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo
...
Merge commit 'aff856d053ba239114e7f16d3cdd240a6d973f2f' into kraken
* commit 'aff856d053ba239114e7f16d3cdd240a6d973f2f':
Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
2010-05-10 09:49:13 -07:00
Dan Egnor
5610c2871b
am 7d167376: Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo
...
Merge commit '7d16737668685b5b4e6158a6ff6f79a92ed3b4d9' into froyo-plus-aosp
* commit '7d16737668685b5b4e6158a6ff6f79a92ed3b4d9':
Add unit test for passing thread priority & cgroup through Binder.
2010-05-10 09:43:53 -07:00
Dirk Dougherty
e4682e8ae7
am fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo
...
Merge commit 'fb70ffd993a9ec60c806b873014b2f0f6e874c77' into froyo-plus-aosp
* commit 'fb70ffd993a9ec60c806b873014b2f0f6e874c77':
Doc change: cherry-pick from master: Testing Android Applications document (concepts)
2010-05-10 09:43:50 -07:00
Scott Main
fe5921aa7e
am c4c42eef: docs: add default value and compatibility info for installLocation
...
Merge commit 'c4c42eef9a62846a152094d61987e6dd2728e417' into froyo-plus-aosp
* commit 'c4c42eef9a62846a152094d61987e6dd2728e417':
docs: add default value and compatibility info for installLocation
2010-05-10 09:43:47 -07:00
Scott Main
d2f2a80e9f
am c6cb8a78: docs: revisions to the new resources doc based on editorial feedback plus some fixes to resource references and other misc revisions
...
Merge commit 'c6cb8a78d03cda44a49a990b4d4153560bee7420' into froyo-plus-aosp
* commit 'c6cb8a78d03cda44a49a990b4d4153560bee7420':
docs: revisions to the new resources doc based on editorial feedback
2010-05-10 09:43:35 -07:00
