Nicolas Roard
ca07c17053
am 2f68be54: am 373b4913: am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart ( https://android-git.corp.google.com/g/#change,51149 )
2010-05-11 10:26:20 -07:00
Dianne Hackborn
a3d73a97b7
am 7d5cea98: am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
2010-05-11 10:26:15 -07:00
Dirk Dougherty
1b37884e7c
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
8df7c60ee6
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
1dec60f893
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
Nicolas Roard
3a1fae098e
am 373b4913: am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart ( https://android-git.corp.google.com/g/#change,51149 )
...
Merge commit '373b4913ab5398736551ab718eb8c39d6f76e5d0' into kraken
* commit '373b4913ab5398736551ab718eb8c39d6f76e5d0':
Fix the 'wobbling fixed elements' bug.
2010-05-11 10:24:00 -07:00
Dianne Hackborn
bd516f83b3
am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
...
Merge commit '7e76b6d191e1173bd85337a2861d9914922f5a0d' into kraken
* commit '7e76b6d191e1173bd85337a2861d9914922f5a0d':
Hopefully fix issue #2662536 : Why is launcher being killed?
2010-05-11 10:23:56 -07:00
Dirk Dougherty
7f0364ebfc
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
73b63df812
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
522fb399ab
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
Nicolas Roard
bdb8e89e84
am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart ( https://android-git.corp.google.com/g/#change,51149 )
...
Merge commit 'f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776' into froyo-plus-aosp
* commit 'f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776':
Fix the 'wobbling fixed elements' bug.
2010-05-11 10:18:59 -07:00
Dianne Hackborn
ead2a8ad7d
am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
...
Merge commit '6d00151c519d5c131cc1480978fe4417cc7bcc79' into froyo-plus-aosp
* commit '6d00151c519d5c131cc1480978fe4417cc7bcc79':
Hopefully fix issue #2662536 : Why is launcher being killed?
2010-05-11 10:18:55 -07:00
Dirk Dougherty
4d6b182101
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
3675b0e4b1
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
0528895b0d
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
6d99bf9017
am e1b2b3b0: Merge "Add continuous focus mode constant." into kraken
2010-05-10 20:06:04 -07:00
Wu-cheng Li
8ccfd2eeeb
Merge "Add continuous focus mode constant." into kraken
2010-05-10 20:04:14 -07:00
Dianne Hackborn
ff91f88305
Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
2010-05-10 17:27:14 -07:00
Dirk Dougherty
d48af30682
Merge "Doc change: Final api diffs 7 -> 8." into froyo
2010-05-10 16:23:13 -07:00
Jim Miller
dbcc5242bc
Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
2010-05-10 15:55:41 -07:00
The Android Open Source Project
98b2fe2502
am e88ae544: am b6f0cbdc: merge from open-source master
2010-05-10 13:52:03 -07:00
The Android Open Source Project
e45269d852
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
22cffae52d
merge from open-source master
...
Change-Id: Ia4cbea9d94b2ff34fc8ce97c1fe35ca5898d6c1c
2010-05-10 13:48:37 -07:00
The Android Open Source Project
9aa82e89f2
am 38a410f1: am 686d9ff5: merge from open-source master
2010-05-10 12:54:45 -07:00
The Android Open Source Project
914b12a965
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
03ba157ee3
merge from open-source master
...
Change-Id: Ic2b28b589d079cf3c9927ce9ad22bc5f9134e445
2010-05-10 12:37:10 -07:00
James Dong
dc0d02a1e9
am 4000e06e: Merge "Metadata construction optimization" into kraken
2010-05-10 11:34:49 -07:00
James Dong
5d95f613a7
Merge "Metadata construction optimization" into kraken
2010-05-10 11:33:25 -07:00
Jean-Baptiste Queru
3658de5fdd
Merge "Include the API level 4 fields in the Parcel."
2010-05-10 11:14:01 -07:00
Robert Greenwalt
f1506a58a4
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
7dfbfe45a6
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
3ed432dff9
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
49503107e9
Merge "String change to refer to wifi tether as hotspot" into froyo
2010-05-10 10:11:12 -07:00
Scott Main
1dbca359ab
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
5bc546043e
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
4f3fbc22bb
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
3bd882a0e2
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
cb4724790a
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
c71f38b756
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
15437b6625
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
2dfe3e140d
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
fbef7ac9e1
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
8261a893d8
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
27291a9911
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
47cd058b5f
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
205212ff1a
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
cf61c9e644
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
4dec4e2594
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
17dff2accd
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
0c7af77450
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
