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
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
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
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
Dianne Hackborn
7c2e76f0a4
Merge "Improve error reporting for issue #3183612 " into gingerbread
2011-03-15 14:40:56 -07:00
Eric Fischer
4670b4d95c
Import revised translations. DO NOT MERGE
...
Change-Id: Ief48781413cadb2a9bd786974e4688ac222d7b36
2011-03-15 14:40:53 -07:00
Dianne Hackborn
1ab43775d8
Improve error reporting for issue #3183612
...
java.lang.SecurityException: Neither user 1209 nor current process
has android.permission.WAKE_LOCK.
Change-Id: I465972ab91b007e04b2ac62550f78583956a4048
2011-03-15 14:38:02 -07:00
Mike Lockwood
b097632099
Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread
2011-03-15 14:04:54 -07:00
Kenny Root
b315078448
am 7ddd62b5: (-s ours) Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
...
* commit '7ddd62b5bedf9065bba00e25aa62f2eae14cf92e':
Add byte limit in addition to ratio for installs DO NOT MERGE
2011-03-15 14:03:50 -07:00
Kenny Root
7ddd62b5be
Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
2011-03-15 14:01:39 -07:00
Mike Lockwood
638d7cb3ee
DO NOT MERGE: Backport more USB accessory changes from honeycomb
...
Change-Id: I8459c5ab9fbf0b3cad752041484a5de44ca9badd
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-15 16:50:18 -04:00
Glenn Kasten
7d7dcb5ea8
am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
...
* commit '4528a7db389b4da73207d00ca15b306a111650cc':
Bug 4016329 do full string comparisons
2011-03-15 13:46:27 -07:00
Glenn Kasten
4528a7db38
Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
2011-03-15 13:44:58 -07:00
Mike Lockwood
c9b82ebb97
am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1
...
* commit '3b7871c242bea5834c657c25fbb89c382566f66f':
USB Manager string clean up:
2011-03-15 13:42:44 -07:00
Svetoslav Ganov
3b901c4b89
am bdabdda8: Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1
...
* commit 'bdabdda8954a70625368fbfe6bb283a9200bf2f8':
CheckBoxPreferences do not fire accessibility events
2011-03-15 13:42:38 -07:00
Mike Lockwood
6a20784e46
am afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1
...
* commit 'afd1c0143dfa63bd133e3a4163cc9cc4216e3514':
SqliteDatabase: Fix local reference leak in custom_function_callback()
2011-03-15 13:42:35 -07:00
Mike Lockwood
3b7871c242
Merge "USB Manager string clean up:" into honeycomb-mr1
2011-03-15 13:34:06 -07:00
Mike Lockwood
ad5f83e91b
USB Manager string clean up:
...
- Use "Cancel" instead of "Ignore"
- Customize the text for the "always use" checkbox for devices and accessories
- Clean up strings for AccessoryChat test program
Bug: 4074719
Change-Id: Ideec838e4c1f1a82ef4ae411c9124417ffb63165
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-15 16:23:40 -04:00
Svetoslav Ganov
bdabdda895
Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1
2011-03-15 13:23:17 -07:00
Mike Lockwood
afd1c0143d
Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1
2011-03-15 13:20:58 -07:00
Adam Powell
fbe9ca7262
am 1d233d97: Merge "Fix bug 4088936 - Tabs in the action bar don\'t seem to have a fading edge" into honeycomb-mr1
...
* commit '1d233d9708e39f5b57b231746df658567b153484':
Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge
2011-03-15 12:51:07 -07:00
Stephen Hines
ae2f3b3a46
am c2db0d40: Merge "Make RS Matrix functions threadable." into honeycomb-mr1
...
* commit 'c2db0d405b7d4b7654dbd3740cc065802e4c294e':
Make RS Matrix functions threadable.
2011-03-15 12:50:57 -07:00
Jamie Gennis
0ea44ac0de
am 00f47af8: Merge "SurfaceTexture: disallow unsupported uses." into honeycomb-mr1
...
* commit '00f47af85a98c6dc3b20d04d8ee6b9a327175ab6':
SurfaceTexture: disallow unsupported uses.
2011-03-15 12:50:55 -07:00
Romain Guy
5c84a1341b
am a1bd5a5f: Merge "Fix disappearing edges in lists/scrollviews/etc. Bug #4093871 " into honeycomb-mr1
...
* commit 'a1bd5a5fd7107483290627d942ae2dd1910b57ca':
Fix disappearing edges in lists/scrollviews/etc. Bug #4093871
2011-03-15 12:50:50 -07:00
Scott Main
d021784432
am 197d7752: am e8f95e7f: docs: update device dashboard
...
* commit '197d77528648b7ec3d44ca6ab63e3036669c1bc8':
docs: update device dashboard
2011-03-15 12:50:47 -07:00
Amith Yamasani
4a04f11b43
am 7e978441: Merge "Use more padding on the sides for SearchView" into honeycomb-mr1
...
* commit '7e978441eeed9defb1031cc17c2857cf06cf825a':
Use more padding on the sides for SearchView
2011-03-15 12:50:35 -07:00