Alex Sakhartchouk
a3f154324a
Fixing uint32 size_t mismatches.
...
Change-Id: I5263158f5855472db6317a52c209fe4e273f3368
2012-02-14 16:00:22 -08:00
Jeff Brown
91e328984c
Clean up InputChannel file descriptor data type.
...
File descriptors are ints.
Change-Id: Ie36733bf36ddfeaa9a09ef6ebd7bd2f1788f5d27
2012-02-14 15:57:59 -08:00
Chris Craik
d658c024ea
Merge "disable webkit paint pausing"
2012-02-14 15:56:08 -08:00
Eric Fischer
c43a97935b
Merge "Import translations."
2012-02-14 15:52:50 -08:00
Amith Yamasani
dd29f8c4e3
Merge "Revert "Incorrect behavior of View clear focus.""
2012-02-14 15:52:17 -08:00
Gilles Debunne
9ae7631332
Merge "Display list invalidated on hint text change"
2012-02-14 15:48:04 -08:00
Gilles Debunne
626c316975
Display list invalidated on hint text change
...
Bug 5993119
Change-Id: I750e73cb5c26e2aaa2a88a80cf35c4d471c30403
2012-02-14 15:46:43 -08:00
Amith Yamasani
73eb97f628
Revert "Incorrect behavior of View clear focus."
...
This reverts commit c6fd88e213703a581fe4680259981f09ae0444f2
2012-02-14 15:45:15 -08:00
Irfan Sheriff
870084d26d
Merge "Initial support for concurrency"
2012-02-14 15:37:07 -08:00
Chris Craik
644b7d95f0
disable webkit paint pausing
...
Temporary measure for investigating potentially related bug:5964385
Change-Id: I6eb0ba25991bdf7eab506b51a9eae71e9ddd436b
2012-02-14 15:29:39 -08:00
Omari Stephens
e4104b8301
Merge "Add a method to the smoke test that launches each app"
2012-02-14 15:18:58 -08:00
Siva Velusamy
892fdd600f
gltrace: Patch up all glUniform*() calls.
...
This patch updates the trace information for all glUniform*() calls
to have the right data (the actual uniforms that are passed).
In addition, as soon as a program is linked, information regarding
all the active attributes and uniforms is passed on to the debugger.
Change-Id: Icfbc6722789b42c413a845cf546577fa6de7da2b
2012-02-14 15:08:20 -08:00
Eric Fischer
4d90ab1258
Import translations.
...
Change-Id: I5deaeadfe002bffd42f3da1eb99d3d09e8a9eb15
2012-02-14 14:58:10 -08:00
Michael Jurka
5f9d991b56
Merge "Fix the build"
2012-02-14 14:56:21 -08:00
Michael Jurka
11f754ce5e
Fix the build
...
Change-Id: I5ec8bfc66d24688b77f15a0ada6cb44a0940c1e1
2012-02-14 14:51:49 -08:00
Fabrice Di Meglio
d7c845c39a
Merge "Make textDirection API public"
2012-02-14 14:45:51 -08:00
Gilles Debunne
43db1d9c47
Merge "Minor typo fixes"
2012-02-14 14:41:15 -08:00
Michael Jurka
a17a7953f9
Merge "Making recents faster"
2012-02-14 13:57:14 -08:00
Robert Greenwalt
7874efeb13
am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
...
* commit 'c8711ca7eb962072ccd6175be3cfa861195ba6cd':
Stop using shared DUN APN when tethering stops.
2012-02-14 13:41:47 -08:00
Robert Greenwalt
3fd0ed8d84
am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
...
* commit 'c8711ca7eb962072ccd6175be3cfa861195ba6cd':
Stop using shared DUN APN when tethering stops.
2012-02-14 13:39:55 -08:00
Robert Greenwalt
84d8eed0d2
am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1
...
* commit 'fc19160a6a464eb71e50794fc1aa1e99c4173e31':
Add a config to set Dun capabilities.
2012-02-14 13:39:53 -08:00
Robert Greenwalt
e3776a47db
am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1
...
* commit 'fc19160a6a464eb71e50794fc1aa1e99c4173e31':
Add a config to set Dun capabilities.
2012-02-14 13:39:25 -08:00
Stephen Hines
0599d6ede3
Merge "Fix typos/spacing with new APIs."
2012-02-14 13:38:43 -08:00
Robert Greenwalt
c8711ca7eb
Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
2012-02-14 13:38:15 -08:00
Robert Greenwalt
fc19160a6a
Merge "Add a config to set Dun capabilities." into ics-mr1
2012-02-14 13:37:44 -08:00
Stephen Hines
10e9f39f1d
Merge "Initialize all class members."
2012-02-14 13:35:21 -08:00
Justin Ho
8a3bf55942
am c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1
...
* commit 'c312ba322b5f204753a2ad8e40062c26114a15d8':
Update 4G WiMAX assets for notification area as well Bug: 5724605
2012-02-14 13:31:28 -08:00
Justin Ho
e6ccc94ef9
am c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1
...
* commit 'c312ba322b5f204753a2ad8e40062c26114a15d8':
Update 4G WiMAX assets for notification area as well Bug: 5724605
2012-02-14 13:31:00 -08:00
Joe Fernandez
8f01c1fe1e
am c9f1eb20: am 6a9beb53: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
...
* commit 'c9f1eb20033d50dadbe028985bedc5022c50ce4c':
2012-02-14 13:30:50 -08:00
Mike Lockwood
7d451e2f7f
am ac7ab269: am 5f423d88: am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
...
* commit 'ac7ab269e5a8c3d25ac243efcc92cc791002e6b9':
2012-02-14 13:30:47 -08:00
John Wang
ef7e8a8a32
am 71bece56: am 749b32df: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
...
* commit '71bece56377896f4799a6d480c459c4344050e64':
2012-02-14 13:30:46 -08:00
Justin Ho
c312ba322b
Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1
2012-02-14 13:29:08 -08:00
Joe Fernandez
2102ce91ea
am 08851a53: am 57f55d7f: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
...
* commit '08851a53a147a4022a37fb61ba17fd2876d2afc5':
docs: Android NDK r7b Release Notes
2012-02-14 13:08:04 -08:00
Mike Lockwood
ef9d55a6b0
am 8f7cc7af: am b9be8eff: am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
...
* commit '8f7cc7af66520e3bd5e59e8eadb6907e3e043661':
Don't pulse LED on new notification unless notification has LED flag set
2012-02-14 13:08:01 -08:00
John Wang
286b364c7b
am 0b17fc36: am 252c64f9: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
...
* commit '0b17fc360185ca7b9d05a096b0033ddd8d883940':
Only use CDMA rssi for config_alwaysUseCdmaRssi.
2012-02-14 13:07:58 -08:00
Joe Fernandez
c9f1eb2003
am 6a9beb53: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
...
* commit '6a9beb536f13c4df178cbe67c74c30d258bef28f':
2012-02-14 13:06:16 -08:00
Mike Lockwood
ac7ab269e5
am 5f423d88: am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
...
* commit '5f423d88753e7c123527d4b7b940788eb2c94821':
2012-02-14 13:06:14 -08:00
John Wang
71bece5637
am 749b32df: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
...
* commit '749b32dfe6ece3ce6ced71d05351a1139d4a4cd4':
2012-02-14 13:06:11 -08:00
Teng-Hui Zhu
728f1ed5e3
Merge "Update the scale while updating the drawGL functor"
2012-02-14 12:51:19 -08:00
Joe Fernandez
08851a53a1
am 57f55d7f: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
...
* commit '57f55d7f9cc1d194054020fcb4e6226579818e27':
docs: Android NDK r7b Release Notes
2012-02-14 12:42:44 -08:00
Mike Lockwood
8f7cc7af66
am b9be8eff: am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
...
* commit 'b9be8eff222d9b70079dd53d0d61de229d8d7914':
Don't pulse LED on new notification unless notification has LED flag set
2012-02-14 12:42:42 -08:00
John Wang
0b17fc3601
am 252c64f9: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
...
* commit '252c64f9c3e2e357f8687e18d8a066cc1cdb8c15':
Only use CDMA rssi for config_alwaysUseCdmaRssi.
2012-02-14 12:42:40 -08:00
Joe Fernandez
6a9beb536f
am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
...
* commit '835e07f8f437e1872451dd23c0faf925388e1aef':
docs: Android NDK r7b Release Notes
2012-02-14 12:37:43 -08:00
Mike Lockwood
5f423d8875
am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
...
* commit 'ffc89899652f5c815b6d156f55a909001420891e':
Don't pulse LED on new notification unless notification has LED flag set
2012-02-14 12:37:40 -08:00
John Wang
749b32dfe6
am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
...
* commit '63b596664c3fdb70ad32c8f641f477ec9140d6ec':
Only use CDMA rssi for config_alwaysUseCdmaRssi.
2012-02-14 12:37:38 -08:00
Joe Fernandez
57f55d7f9c
am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
...
* commit '835e07f8f437e1872451dd23c0faf925388e1aef':
docs: Android NDK r7b Release Notes
2012-02-14 12:37:18 -08:00
Mike Lockwood
b9be8eff22
am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
...
* commit 'ffc89899652f5c815b6d156f55a909001420891e':
Don't pulse LED on new notification unless notification has LED flag set
2012-02-14 12:37:16 -08:00
John Wang
252c64f9c3
am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
...
* commit '63b596664c3fdb70ad32c8f641f477ec9140d6ec':
Only use CDMA rssi for config_alwaysUseCdmaRssi.
2012-02-14 12:37:14 -08:00
Mathias Agopian
80fe2c4e5e
Merge changes I7a6b9db4,Ib579f580
...
* changes:
EGLConfig is now not remaped to an internal EGLConfig
remove multiplexing of multiple EGL implementation
2012-02-14 12:35:02 -08:00
Justin Ho
9dd3a66286
Update 4G WiMAX assets for notification area as well
...
Bug: 5724605
Change-Id: Iade031923f1d3a07ca6dd366642c04071168d495
2012-02-14 12:10:54 -08:00