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
Justin Ho
a1e4b659eb
am 9b183a72: Merge "Updated notification asset for DND mode" into honeycomb-mr1
...
* commit '9b183a72bcaab75897d1571d55ecbaf228ed4abd':
Updated notification asset for DND mode
2011-03-15 21:37:27 -07:00
Mike Lockwood
3359001b41
USB System UI: Fix string localization problems
...
Bug: 4108271
Bug: 4089121
Change-Id: Icd83ba20dc8dc8a71c17cf759138047b53c70fda
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-15 22:26:28 -04:00
Eric Laurent
3913c131c6
Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1
2011-03-15 19:17:53 -07:00
Romain Guy
46fc25171a
Merge "Fix performance issue in Launcher Bug #3515248 " into honeycomb-mr1
2011-03-15 18:23:48 -07:00
Justin Ho
6764ecf863
Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1
2011-03-15 16:52:07 -07:00
Justin Ho
141505a976
Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1
2011-03-15 16:47:27 -07:00
Justin Ho
75fe135e62
Integrating new ADB USB debugging asset
...
Bug: #6699FF
Change-Id: Iab8debef59178d56ea78883a5737b7614649f948
2011-03-15 16:40:36 -07:00
Justin Ho
a5c064e0d9
Fix expander list group indicator
...
Bug: #6699FF
Change-Id: I48f2ecb2246ad5d5e11d7e9122b6ef90c764b571
2011-03-15 16:38:58 -07:00
Romain Guy
6217a71cd2
Fix performance issue in Launcher
...
Bug #3515248
The problem is caused by the fast path when compositing layers on screen.
The fast path draws a single quad using glDrawArrays() whereas the general
path draws an arbitrary mesh using glDrawElements(). It looks like there's
an issue in the driver since glDrawArrays() is significantly slower than
glDrawElements() for a quad (6 vertices!)
This change just gets rid of the fast path.
Change-Id: Ib2361253ec67f44a988270f76c183422f12ce537
2011-03-15 16:32:28 -07:00
Stephen Hines
2d5cbc92ad
Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1
2011-03-15 16:22:19 -07:00
Rajneesh Chowdury
8e7991a52e
Fix for 4087846 Crash reported by monkey report (Java/Jni)
...
Change-Id: I356f975743f5a24e72f33a20ee497a2b12791be6
2011-03-15 16:20:17 -07:00
Dianne Hackborn
9b7c1274dd
am e2e8da7c: am 7c2e76f0: Merge "Improve error reporting for issue #3183612 " into gingerbread
...
* commit 'e2e8da7c734b71c4b6b81e51e16ce3f4061f0f07':
Improve error reporting for issue #3183612
2011-03-15 15:44:18 -07:00
Mike Lockwood
a32b5978b7
am 3c9aa1aa: (-s ours) am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread
...
* commit '3c9aa1aa093ff8acc5ec71190a35b9ab04d64fda':
DO NOT MERGE: Backport more USB accessory changes from honeycomb
2011-03-15 15:44:13 -07:00
Eric Fischer
acca16004f
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-15 14:59:33 -07:00
Dianne Hackborn
e2e8da7c73
am 7c2e76f0: Merge "Improve error reporting for issue #3183612 " into gingerbread
...
* commit '7c2e76f0a4daa7e4316e7a85d41d3c391319d955':
Improve error reporting for issue #3183612
2011-03-15 14:49:45 -07:00
Mike Lockwood
3c9aa1aa09
am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread
...
* commit 'b09763209980ff9210cc353f2410598220ec0480':
DO NOT MERGE: Backport more USB accessory changes from honeycomb
2011-03-15 14:49:37 -07:00
Stephen Hines
ef65bb30ed
2X2 matrix needs 4 float elements.
...
BUG=4104094
Change-Id: I175bde5839d6f1c56b2fd7499853be723e85120f
2011-03-15 14:47:31 -07:00
Justin Ho
9b183a72bc
Merge "Updated notification asset for DND mode" into honeycomb-mr1
2011-03-15 14:41:30 -07:00