Xavier Ducrohet
196a360071
Merge "LayoutLib: put a default image on the quickcontactbadge." into honeycomb
2011-01-26 19:54:46 -08:00
Jim Miller
eb1b0edd61
Merge "Fix 3381324: Restart ripples when the user moves away from the edge." into honeycomb
2011-01-26 19:39:23 -08:00
Justin Ho
be6c48f741
Merge "Integrating xlarge mdpi battery charging assets" into honeycomb
2011-01-26 19:34:50 -08:00
Michael Kolb
885bf8a181
Merge "fix incognito url loading" into honeycomb
2011-01-26 19:21:49 -08:00
Dianne Hackborn
053eda3144
am f35d43f9: am 2dc9c784: Merge "Fix issue #3382992 : IME close animation stutters from URL bar" into honeycomb
...
* commit 'f35d43f90b9e4553343a59b217430aaba91b0d1f':
Fix issue #3382992 : IME close animation stutters from URL bar
2011-01-26 19:17:46 -08:00
Scott Main
d8f50d97ab
am 796f1af0: Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit '796f1af04567dab098f638c9166caebc2818efe4':
enable preview mode for docs and add api level 10 flag for api level diffs
2011-01-26 19:13:54 -08:00
Romain Guy
5f16f61184
am 0d8f88b2: am ede54ce2: Merge "Fix crash in movie studio." into honeycomb
...
* commit '0d8f88b272f80f2a3594d2d988faabed4e540631':
Fix crash in movie studio.
2011-01-26 19:13:50 -08:00
Romain Guy
de38d0d90a
am 0518e7b5: am 9c8307fb: Merge "Make sure that we update SurfaceView\'s window with display lists. Bug #3395487 " into honeycomb
...
* commit '0518e7b5bddfdeb010591c736fb080009a99cd14':
Make sure that we update SurfaceView's window with display lists. Bug #3395487
2011-01-26 19:13:40 -08:00
Daniel Sandler
d05be40695
am 0517ea2a: am da597b5c: Merge "Status bar visual tweaks." into honeycomb
...
* commit '0517ea2ab8e4dae5fe2394cfecced6afb121b95e':
Status bar visual tweaks.
2011-01-26 19:13:33 -08:00
Gilles Debunne
47a3e90850
am 2cb4a215: am bc3f7937: Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
...
* commit '2cb4a215ad3d42fe9b90a1b045d5ce1c3d09bf9d':
Tabs are resized to make sure they fit in their parent.
2011-01-26 19:13:24 -08:00
Jaikumar Ganesh
6bc9f9aec0
am e97c0188: am 55271a79: Merge "Disable PBAP for no voice capability" into honeycomb
...
* commit 'e97c01888fcc94453041eb6adc575598d744b580':
Disable PBAP for no voice capability
2011-01-26 19:11:20 -08:00
Shih-wei Liao
32f7cd7478
am 957ee34d: am b9d69d59: Merge "For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)" into honeycomb
...
* commit '957ee34d73e6b0bec91edaad57be641834855758':
For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)
2011-01-26 19:11:15 -08:00
Dianne Hackborn
73e1656b93
am 280afad7: (-s ours) am 14cd455d: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '280afad7c406a0d2bba966448c8b388d7f726b8a':
Import revised translations. DO NOT MERGE
2011-01-26 19:11:09 -08:00
Scott Main
60c143aaf0
am 711788bb: am bedd2427: am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
...
* commit '711788bb81cfb8b62e9bd7284f01a1d2b55fac8d':
catchup the gingerbread branch to gingerbread-docs for all sdk docs
2011-01-26 19:10:38 -08:00
Wink Saville
7ce4fc5b73
am 93fbb0ad: am 13a8f2a5: Merge "Comment out the isAvailable optimization." into honeycomb
...
* commit '93fbb0ad960a658633dfa2bc7be9584e4361ab85':
Comment out the isAvailable optimization.
2011-01-26 19:09:22 -08:00
Scott Main
35287775e9
am d2b87091: am 0f2e2b8b: Merge "Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it\'s not a good location and the info is avilable in the dev guide, but also added some of the
...
* commit 'd2b87091cc30c575496eb78ebea88297da775359':
Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it's not a good location and the info is avilable in the dev guide, but also added some of the info to the Resources class description.
2011-01-26 19:08:55 -08:00
Andreas Huber
e79513893b
am c296b573: (-s ours) am 586096a9: (-s ours) am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
...
* commit 'c296b5738947003c96dfc5b93c86f27b955429ff':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
2011-01-26 19:08:49 -08:00
Jeff Brown
2f4df9187f
am 6774b1c5: am 91f2dbb7: (-s ours) am 7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps."
...
* commit '6774b1c5920be3f5be8ce2d5b5c0f620bd271dbc':
Move keymaps from sdk/emulator/keymaps.
2011-01-26 19:08:42 -08:00
Dianne Hackborn
9091b66726
am 2dc9c784: Merge "Fix issue #3382992 : IME close animation stutters from URL bar" into honeycomb
...
* commit '2dc9c784b2fab67a8233318f559e65f444bf0c97':
Fix issue #3382992 : IME close animation stutters from URL bar
2011-01-26 19:08:20 -08:00
Xavier Ducrohet
535de8f2a5
am 73b58c0b: am ee37ab8d: Merge "LayoutLib: properly erase the bitmap when rendering a new session." into honeycomb
...
* commit '73b58c0bd9faf99b19c1fcfe5bcf94cebd65634e':
LayoutLib: properly erase the bitmap when rendering a new session.
2011-01-26 19:08:20 -08:00
Dianne Hackborn
6a3751bba1
am c0d8f88e: am 93257271: Merge "Remove xlarge specific icon size" into honeycomb
...
* commit 'c0d8f88e6aa0cd0e18ff8ddb0d4c479b06e691b4':
Remove xlarge specific icon size
2011-01-26 19:08:05 -08:00
Dianne Hackborn
e46a5cb29b
am 2c552372: am 8c0ac870: Merge "Fix another part of #3387855 : Menu flashes on left side of screen" into honeycomb
...
* commit '2c552372ceff3025dfae6f0d2cc91b7d103970fd':
Fix another part of #3387855 : Menu flashes on left side of screen
2011-01-26 19:07:57 -08:00
Dianne Hackborn
4fa921ef05
am 5640392f: am 2d63144e: Merge "Fix issue #3380072 : Switching in and out of gmail not preserving position in label" into honeycomb
...
* commit '5640392f584c64f048180ac75218b5c7f9281b76':
Fix issue #3380072 : Switching in and out of gmail not preserving position in label
2011-01-26 19:07:46 -08:00
Mike Lockwood
23ba0b9ff7
am ba492eb6: am 278a04eb: Merge "Fix javadoc for MediaStore.Files.FileColumns constants" into honeycomb
...
* commit 'ba492eb636a45cd5686fb0e6eb807e3deaa500fb':
Fix javadoc for MediaStore.Files.FileColumns constants
2011-01-26 19:07:34 -08:00
Winson Chung
6c33daac76
am ab4ea688: am b90a91c6: Making requested indices the last to be pruned when we hit cache memory limits. (3368863)
...
* commit 'ab4ea688694a3de4580d341a568e523902731855':
Making requested indices the last to be pruned when we hit cache memory limits. (3368863)
2011-01-26 19:07:13 -08:00
Andreas Huber
2d999590d1
am bba92023: am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb
...
* commit 'bba92023e55f46e8b4f8b81b3412e663a5e71ceb':
This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
2011-01-26 19:06:43 -08:00
Jim Miller
4f41834990
am eaa738ef: am 85433c76: Merge "Fix 3354590: Add back button to dismiss RecentAppsPanel" into honeycomb
...
* commit 'eaa738efac8cb34d57ca6c0aea4c95586b0d9fd4':
Fix 3354590: Add back button to dismiss RecentAppsPanel
2011-01-26 19:06:30 -08:00
Dianne Hackborn
2216fe00b1
Merge "Fix issue #3382992 : IME close animation stutters from URL bar" into honeycomb
2011-01-26 19:04:15 -08:00
Scott Main
b4e62fdab5
Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-01-26 18:48:22 -08:00
Romain Guy
0cc087096f
am ede54ce2: Merge "Fix crash in movie studio." into honeycomb
...
* commit 'ede54ce2fe3252d4ab56b90de464b35a6920970d':
Fix crash in movie studio.
2011-01-26 18:47:59 -08:00
Scott Main
0d308338e8
resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp
...
Change-Id: Ib40af8301e19b70c86161fc0a6cc061b118863ab
2011-01-26 18:47:13 -08:00
Romain Guy
1cbd3b6224
Merge "Fix crash in movie studio." into honeycomb
2011-01-26 18:46:29 -08:00
Scott Main
70b372b82c
am ba3dd323: enable preview mode for docs and add api level 10 flag for api level diffs
...
* commit 'ba3dd32357b47ab0b55a1976bbafc225df78a59d':
enable preview mode for docs and add api level 10 flag for api level diffs
2011-01-26 18:37:22 -08:00
Romain Guy
573241da75
am 9c8307fb: Merge "Make sure that we update SurfaceView\'s window with display lists. Bug #3395487 " into honeycomb
...
* commit '9c8307fb19558ffe2e897bad009fb038bb9e845b':
Make sure that we update SurfaceView's window with display lists. Bug #3395487
2011-01-26 18:32:54 -08:00
Romain Guy
9448a44f94
Merge "Make sure that we update SurfaceView's window with display lists. Bug #3395487 " into honeycomb
2011-01-26 18:29:38 -08:00
Daniel Sandler
f0e557ea49
am da597b5c: Merge "Status bar visual tweaks." into honeycomb
...
* commit 'da597b5c1a6553a43f1e938ef87b29c8f2a59386':
Status bar visual tweaks.
2011-01-26 18:19:19 -08:00
Daniel Sandler
1454366906
Merge "Status bar visual tweaks." into honeycomb
2011-01-26 18:17:49 -08:00
Gilles Debunne
b0aab24612
am bc3f7937: Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
...
* commit 'bc3f79371bb93e075bcb91d92180487337afce17':
Tabs are resized to make sure they fit in their parent.
2011-01-26 18:10:58 -08:00
Gilles Debunne
fc5caaa981
Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
2011-01-26 18:09:23 -08:00
Jaikumar Ganesh
6efcffac38
am 55271a79: Merge "Disable PBAP for no voice capability" into honeycomb
...
* commit '55271a79d1c14e2952d550995569135a23971672':
Disable PBAP for no voice capability
2011-01-26 18:03:40 -08:00
Shih-wei Liao
ebf617c691
am b9d69d59: Merge "For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)" into honeycomb
...
* commit 'b9d69d595fa17ae87b4e615c2339df64a5df8324':
For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)
2011-01-26 18:03:31 -08:00
Dianne Hackborn
4311a6fff3
am 14cd455d: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '14cd455dd57f2708b63f88aab24ba6c75d13d96f':
Import revised translations. DO NOT MERGE
2011-01-26 18:03:18 -08:00
Scott Main
2982fb63a7
am bedd2427: am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
...
* commit 'bedd242768f7594d12bde0b4c4e7d153c27858d4':
catchup the gingerbread branch to gingerbread-docs for all sdk docs
2011-01-26 17:58:54 -08:00
Scott Main
b219a84d85
am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
...
* commit 'a7ce2f04ef0ae548370eebd1314558f24f40e8f0':
catchup the gingerbread branch to gingerbread-docs for all sdk docs
2011-01-26 17:56:26 -08:00
Jaikumar Ganesh
70f8e33a69
Merge "Disable PBAP for no voice capability" into honeycomb
2011-01-26 17:52:50 -08:00
Scott Main
e0f78c41aa
Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
2011-01-26 17:52:08 -08:00
Shih-wei Liao
a3ac0ecd8f
Merge "For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)" into honeycomb
2011-01-26 17:43:13 -08:00
Dianne Hackborn
2ae04628fb
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-01-26 17:38:57 -08:00
Wink Saville
03fa9e7f16
am 13a8f2a5: Merge "Comment out the isAvailable optimization." into honeycomb
...
* commit '13a8f2a59c063b988502de9b7197d83b5db487d9':
Comment out the isAvailable optimization.
2011-01-26 17:32:10 -08:00
Wink Saville
6ee6d12431
Merge "Comment out the isAvailable optimization." into honeycomb
2011-01-26 17:29:32 -08:00