Joe Onorato
b7071faee0
am 7c77bd0e: am e193c468: Merge "Fix 3388705: Explicitly check for low battery level" into honeycomb
...
* commit '7c77bd0e3dda93242e7dbcfb4754817894483653':
Fix 3388705: Explicitly check for low battery level
2011-01-26 22:26:15 -08:00
Joe Onorato
b3caedfa76
am e193c468: Merge "Fix 3388705: Explicitly check for low battery level" into honeycomb
...
* commit 'e193c4688f9062e1d4dba97413788b6ffa122a55':
Fix 3388705: Explicitly check for low battery level
2011-01-26 22:23:56 -08:00
Joe Onorato
b44ba5fe26
Merge "Fix 3388705: Explicitly check for low battery level" into honeycomb
2011-01-26 22:21:26 -08:00
Joe Onorato
d036a4398a
am 5702e88b: am ea1fbe9c: Merge "Revert "getRingtone is causing an anr. Turn it off for now."" into honeycomb
...
* commit '5702e88b7f7fa72acfe9a34bffde54f578b1a94a':
Revert "getRingtone is causing an anr. Turn it off for now."
2011-01-26 22:04:41 -08:00
Joe Onorato
48edeff1fd
am ea1fbe9c: Merge "Revert "getRingtone is causing an anr. Turn it off for now."" into honeycomb
...
* commit 'ea1fbe9c8c9fe32690252dcc4dc96c93ae03f686':
Revert "getRingtone is causing an anr. Turn it off for now."
2011-01-26 22:02:18 -08:00
Joe Onorato
d62cc7b256
Merge "Revert "getRingtone is causing an anr. Turn it off for now."" into honeycomb
2011-01-26 22:00:07 -08:00
Basavapatna Dattaguru
b53541f18d
am a33537c3: am 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb
...
* commit 'a33537c3f1dbe1a4fa57560c406bf45e8f52436e':
Video editor CTS: Framework modifications
2011-01-26 21:54:16 -08:00
Basavapatna Dattaguru
d256ef1015
am 55bf9bdb: am 643e8476: Merge "Fixes Issue ID: 3396697" into honeycomb
...
* commit '55bf9bdbcb3cab86a776fe6b5493b9bcec99fc21':
Fixes Issue ID: 3396697
2011-01-26 21:52:02 -08:00
Basavapatna Dattaguru
267604df1c
am 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb
...
* commit '9af5da5258d14c743150318e9887b7d10c0117d4':
Video editor CTS: Framework modifications
2011-01-26 21:51:49 -08:00
Basavapatna Dattaguru
b0b18b9133
am 643e8476: Merge "Fixes Issue ID: 3396697" into honeycomb
...
* commit '643e8476e1b9da93a06d073797863298ae268393':
Fixes Issue ID: 3396697
2011-01-26 21:49:34 -08:00
Basavapatna Dattaguru
f9f29d4c9d
Merge "Video editor CTS: Framework modifications" into honeycomb
2011-01-26 21:48:02 -08:00
Basavapatna Dattaguru
7c2066afb0
Merge "Fixes Issue ID: 3396697" into honeycomb
2011-01-26 21:47:40 -08:00
Justin Ho
7dfae49485
am 5d15cc71: am 08006286: Merge "New stat_sys_download/upload icons" into honeycomb
...
* commit '5d15cc7174388af04a9897c03bcd7e4d81e578b2':
New stat_sys_download/upload icons
2011-01-26 21:44:22 -08:00
Justin Ho
3f5353a19e
am 08006286: Merge "New stat_sys_download/upload icons" into honeycomb
...
* commit '08006286b40cf9031766a97e4d50ebb47c8b514d':
New stat_sys_download/upload icons
2011-01-26 21:41:50 -08:00
Justin Ho
039a1dc35c
Merge "New stat_sys_download/upload icons" into honeycomb
2011-01-26 21:37:22 -08:00
James Dong
da966f749e
am f1e687b6: am 3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycomb
...
* commit 'f1e687b6e31ba4597558de94c40a73a074ba7703':
Eliminate duplicated code in export method
2011-01-26 21:20:16 -08:00
Kenny Root
cc82bdd6d0
am 1f8e2f99: am 5d506fa7: Merge "Add API for preferred Launcher icon size and density" into honeycomb
...
* commit '1f8e2f99585040b3904f1b6863000d9d208eda02':
Add API for preferred Launcher icon size and density
2011-01-26 21:19:59 -08:00
Xavier Ducrohet
a37b340cf6
am 8c7fd1e9: am 62461d12: Merge "LayoutLib: put a default image on the quickcontactbadge." into honeycomb
...
* commit '8c7fd1e96a012c6ebc8bdf1b38df7667456b8fcb':
LayoutLib: put a default image on the quickcontactbadge.
2011-01-26 21:19:42 -08:00
Jim Miller
bccb754a5f
am df82ad9f: am 57d472a5: Merge "Fix 3381324: Restart ripples when the user moves away from the edge." into honeycomb
...
* commit 'df82ad9fb239572f3076ffc8894697b9de3d18d1':
Fix 3381324: Restart ripples when the user moves away from the edge.
2011-01-26 21:19:36 -08:00
Justin Ho
f6039ebe86
am 5b78e092: am 597e644d: Merge "Integrating xlarge mdpi battery charging assets" into honeycomb
...
* commit '5b78e092dd7a97c47169f3442e73c1c934002cbc':
Integrating xlarge mdpi battery charging assets
2011-01-26 21:19:30 -08:00
Michael Kolb
4df2eb6680
am cda2da1f: am 85fd2c91: Merge "fix incognito url loading" into honeycomb
...
* commit 'cda2da1f23f7be6dd2c41746a49ff41bf66958df':
fix incognito url loading
2011-01-26 21:19:20 -08:00
James Dong
b5b4be85ee
am 3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycomb
...
* commit '3b1fd35c6876f7eb1d15db3095c3e57969783302':
Eliminate duplicated code in export method
2011-01-26 21:15:37 -08:00
Kenny Root
20f3810ba9
am 5d506fa7: Merge "Add API for preferred Launcher icon size and density" into honeycomb
...
* commit '5d506fa7274e8ba84e348e11c22729b58802f796':
Add API for preferred Launcher icon size and density
2011-01-26 21:15:28 -08:00
Xavier Ducrohet
1b090b7b22
am 62461d12: Merge "LayoutLib: put a default image on the quickcontactbadge." into honeycomb
...
* commit '62461d128fcb1314d96661e77f9744e5e50f57e3':
LayoutLib: put a default image on the quickcontactbadge.
2011-01-26 21:15:22 -08:00
Jim Miller
01f8cb8dce
am 57d472a5: Merge "Fix 3381324: Restart ripples when the user moves away from the edge." into honeycomb
...
* commit '57d472a5b1f69e3aa0159f41c7ef625d4418c27f':
Fix 3381324: Restart ripples when the user moves away from the edge.
2011-01-26 21:15:17 -08:00
Justin Ho
6202fc3289
am 597e644d: Merge "Integrating xlarge mdpi battery charging assets" into honeycomb
...
* commit '597e644d7a445e6f5555f3f51b6ed78b1e6c1243':
Integrating xlarge mdpi battery charging assets
2011-01-26 21:15:10 -08:00
Michael Kolb
d997a34f33
am 85fd2c91: Merge "fix incognito url loading" into honeycomb
...
* commit '85fd2c9102f7cf105bf498f05ca35360a4bcede5':
fix incognito url loading
2011-01-26 21:15:01 -08:00
James Dong
726f4d9178
Merge "Eliminate duplicated code in export method" into honeycomb
2011-01-26 20:42:18 -08:00
Kenny Root
104b2dc3ed
Merge "Add API for preferred Launcher icon size and density" into honeycomb
2011-01-26 20:16:31 -08:00
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