Romain Guy
80911b8517
Modify the GL renderer's functor to pass the clip to WebView
...
Change-Id: If5efe399ca58f3000b2883e24e9f3736a2025184
2011-03-16 15:31:33 -07:00
James Dong
1cbf8493da
am 28fc2037: am fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1
...
* commit '28fc2037bffd1593b56fe1e1522de544a7d49120':
Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
2011-03-16 15:12:58 -07:00
James Dong
28fc2037bf
am fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1
...
* commit 'fc59176241f498ad4eeb4237800c2eb5edd9efcd':
Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
2011-03-16 15:11:03 -07:00
James Dong
fc59176241
Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1
2011-03-16 15:09:21 -07:00
Justin Ho
33cb33d7de
Updated copy/paste/cut assets for AB
...
Removing old unnecessary assets from tree
Bug: 6699FF
Change-Id: I8df98326917d99febdabcb8b62f3dbbff06d67c8
2011-03-16 15:09:17 -07:00
Shimeng (Simon) Wang
0c4f09be5b
am f2532d16: am 464b690a: Pass firstLayout info to native webview when setting baseLayer.
...
* commit 'f2532d16a4a2ca4dffe9bf9568fdd24475369cac':
Pass firstLayout info to native webview when setting baseLayer.
2011-03-16 14:49:18 -07:00
Shimeng (Simon) Wang
f2532d16a4
am 464b690a: Pass firstLayout info to native webview when setting baseLayer.
...
* commit '464b690ada24428f3dff4102659048db7128835f':
Pass firstLayout info to native webview when setting baseLayer.
2011-03-16 14:47:32 -07:00
Mathias Agopian
3d69bea1f6
fix [4107131] nvidia driver call takes a very long time
...
We were leaking all EGLSyncKHR objects, over time the list
would grow and become very slow to operate on.
Bug: 4107131
Change-Id: I6c82daf49fe3189d04550781d64d57c30c95f552
2011-03-16 14:19:03 -07:00
James Dong
6ec0ca9e8e
Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
...
bug - 4109530
Change-Id: Ib83be7a7f767a4b20ac338734ada1581e7a4c5bf
2011-03-16 14:11:32 -07:00
Shimeng (Simon) Wang
464b690ada
Pass firstLayout info to native webview when setting baseLayer.
...
issue: 4094300
Change-Id: I4fdbc0cee73230a731b1356f44372cd86a5c4ad1
2011-03-16 13:56:37 -07:00
Michael Kolb
5b7a1bd790
am b0a07f0c: am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1
...
* commit 'b0a07f0ce54ee812f9a00cc53f43919051d563c3':
add comment to deprecated tag
2011-03-16 13:38:24 -07:00
Andreas Huber
1a47fc3531
am 7532ae7f: am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1
...
* commit '7532ae7f79d6d849faae1a9bee171c66bd534d97':
DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
2011-03-16 13:36:35 -07:00
Michael Kolb
b0a07f0ce5
am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1
...
* commit '6bb2020e6e9914f6df3dc7d69dbd21782267fbd4':
add comment to deprecated tag
2011-03-16 13:34:30 -07:00
Andreas Huber
7532ae7f79
am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1
...
* commit '46956b0691b2a228237d17536fe4ad33a760c0af':
DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
2011-03-16 13:18:42 -07:00
Michael Kolb
6bb2020e6e
Merge "add comment to deprecated tag" into honeycomb-mr1
2011-03-16 13:10:48 -07:00
Andreas Huber
46956b0691
Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1
2011-03-16 13:06:52 -07:00
Michael Kolb
24e53b00b0
add comment to deprecated tag
...
Change-Id: Id0c30c43abfeb9005f9b69e0a565644c7c956295
2011-03-16 12:56:39 -07:00
Mike Lockwood
89de72d83a
am 1d8b5a5e: am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1
...
* commit '1d8b5a5e866f75d516dd6f03424f37b1de9a3d97':
USB System UI: Improve message for the "no app for USB accessory" dialog.
2011-03-16 12:09:27 -07:00
Mike Lockwood
1d8b5a5e86
am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1
...
* commit '75d62cee30557145e48d792fdce4769235daa9ce':
USB System UI: Improve message for the "no app for USB accessory" dialog.
2011-03-16 12:06:58 -07:00
Andreas Huber
5bd3bb46b1
DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
...
Change-Id: I70dfdfb7c27e3c713079c359ef89a570eb600dc7
related-to-bug: 4039068
2011-03-16 12:04:56 -07:00
Mike Lockwood
27d9fb5716
DO NOT MERGE: Improve message for the "no app for USB accessory" dialog.
...
Change-Id: I642a38d3e541b3d531eed1a00708f6864d8cab4c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-16 15:04:22 -04:00
Mike Lockwood
75d62cee30
Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1
2011-03-16 12:03:39 -07:00
Daniel Sandler
8d5d19c990
Remove logspew.
...
Bug: 4114202
Change-Id: I88de0f98bb33f0d1258b702169d754e98648e403
2011-03-16 15:02:18 -04:00
Michael Kolb
d799caa9a6
am 9a0df3c5: am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
...
* commit '9a0df3c5c730ff12e050945f2bad0d86a37c5b2f':
deprecate getVisibleTitleHeight
2011-03-16 11:37:23 -07:00
Michael Kolb
9a0df3c5c7
am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
...
* commit '95fd065e3cef0bef723a2e624191b08bb00ce6f8':
deprecate getVisibleTitleHeight
2011-03-16 11:35:45 -07:00
Michael Kolb
95fd065e3c
Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
2011-03-16 11:33:13 -07:00
Mike Lockwood
b893916fb8
USB System UI: Improve message for the "no app for USB accessory" dialog.
...
Change-Id: I72bdc3afa152ed7a0e30b1a0e8d9cb2e53ca3f29
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-16 14:10:03 -04:00
Eric Fischer
d40e0efb02
am d5eb3bbb: am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'd5eb3bbbf2959553005df173165b6b65231798a2':
Import revised translations. DO NOT MERGE
2011-03-16 10:54:33 -07:00
Eric Fischer
d5eb3bbbf2
am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'cc571e9643865edc3f25aa133c467ace46ce8e80':
Import revised translations. DO NOT MERGE
2011-03-16 10:51:56 -07:00
Eric Fischer
cc571e9643
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-16 10:23:02 -07:00
Eric Fischer
326c1c7247
Import revised translations. DO NOT MERGE
...
Change-Id: I654f633a58cb935a3388e5b558101912dae7fde7
2011-03-16 10:11:58 -07:00
Michael Kolb
e54f66524e
deprecate getVisibleTitleHeight
...
Bug: 4104535
Change-Id: I8a6ef21d38a25848efa28e2c06cf2da0ff7af9c4
2011-03-16 09:25:23 -07:00
Mike Lockwood
c132f45c5b
am 2b2aaf2b: am ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1
...
* commit '2b2aaf2be9fb77e445574ae6c761e10cca1310b0':
USB System UI: Fix string localization problems
2011-03-16 04:35:23 -07:00
Mike Lockwood
2b2aaf2be9
am ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1
...
* commit 'ff51d29a0bbf7006833ad67b1aa8a52a8a9a2514':
USB System UI: Fix string localization problems
2011-03-16 04:33:29 -07:00
Mike Lockwood
ff51d29a0b
Merge "USB System UI: Fix string localization problems" into honeycomb-mr1
2011-03-16 04:31:15 -07:00
Eric Laurent
9bb250bfe7
am a6c3ace3: am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1
...
* commit 'a6c3ace3274e49075284c25750485af9a72203ba':
Improvement for issue 3489986: BT SCO volume
2011-03-15 23:47:26 -07:00
Romain Guy
f8c4c12802
am 0f7d2ec3: am 46fc2517: Merge "Fix performance issue in Launcher Bug #3515248 " into honeycomb-mr1
...
* commit '0f7d2ec37fc514c08dde977d55489af16355efa0':
Fix performance issue in Launcher Bug #3515248
2011-03-15 23:47:23 -07:00
Justin Ho
30d7eb02b5
am 6ad9cc9a: am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1
...
* commit '6ad9cc9afd1229db0ee68a889979feffbbcba557':
Integrating new ADB USB debugging asset Bug: #6699FF
2011-03-15 23:47:20 -07:00
Justin Ho
201bc41e0c
am 750a4a26: am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1
...
* commit '750a4a2623f8bb5167c87b1f5d3bcce12695a13d':
Fix expander list group indicator Bug: #6699FF
2011-03-15 23:47:17 -07:00
Stephen Hines
89254a114b
am e01675cd: am 2d5cbc92: Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1
...
* commit 'e01675cdbe083331607a01e38fa71caed2d48f71':
2X2 matrix needs 4 float elements.
2011-03-15 23:47:14 -07:00
Eric Laurent
a6c3ace327
am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1
...
* commit '3913c131c61288c5b4eedb063d9eb6b6204d2a1f':
Improvement for issue 3489986: BT SCO volume
2011-03-15 23:44:43 -07:00
Romain Guy
0f7d2ec37f
am 46fc2517: Merge "Fix performance issue in Launcher Bug #3515248 " into honeycomb-mr1
...
* commit '46fc25171af8bbaf4594946ce406a667ce2ec27a':
Fix performance issue in Launcher Bug #3515248
2011-03-15 23:44:30 -07:00
Justin Ho
6ad9cc9afd
am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1
...
* commit '6764ecf8630af4c6260007e688cea0056ecf4ec7':
Integrating new ADB USB debugging asset Bug: #6699FF
2011-03-15 23:44:12 -07:00
Justin Ho
750a4a2623
am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1
...
* commit '141505a9769099ac38eacb62409a75ff891860a1':
Fix expander list group indicator Bug: #6699FF
2011-03-15 23:44:08 -07:00
Stephen Hines
e01675cdbe
am 2d5cbc92: Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1
...
* commit '2d5cbc92add5065a62acdd38cd254eebb1ee2f94':
2X2 matrix needs 4 float elements.
2011-03-15 23:43:55 -07:00
Eric Fischer
0dd0a80503
am a78327da: am acca1600: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'a78327da4588c60b44163d169f9f973edbdde69f':
Import revised translations. DO NOT MERGE
2011-03-15 23:31:55 -07:00
Eric Fischer
a78327da45
am acca1600: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'acca16004fd58c2b8c489f031281b58551551dc8':
Import revised translations. DO NOT MERGE
2011-03-15 23:29:10 -07:00
Kenny Root
d57440c18e
am 29d30cdc: Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
...
* commit '29d30cdc641fd4ee55434aa487c07b2d4434a7ac':
Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
2011-03-15 23:23:52 -07:00
Kenny Root
29d30cdc64
Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
2011-03-15 23:09:13 -07:00
Justin Ho
cb2d1be93d
am a1e4b659: am 9b183a72: Merge "Updated notification asset for DND mode" into honeycomb-mr1
...
* commit 'a1e4b659ebeb44e21de7c7cd8f772d218e7553ec':
Updated notification asset for DND mode
2011-03-15 21:42:10 -07:00