Commit Graph

45483 Commits

Author SHA1 Message Date
Glenn Kasten
7a091616c9 Merge "Fixed possible heap corruption in EffectDesc" 2012-02-17 09:19:49 -08:00
Eric Fischer
4763bfe27e Merge "Import translations." 2012-02-16 21:10:27 -08:00
Jeff Brown
e7888960f1 Merge "Don't throw on EPIPE in consumeBatchedInputEvents." 2012-02-16 20:31:29 -08:00
Christian Robertson
8292fff6fa Merge "Update DroidNaskh font" 2012-02-16 19:59:08 -08:00
Jeff Brown
bc9b55410e Merge "Mark input and sensor messages as asynchronous." 2012-02-16 19:49:14 -08:00
Jeff Brown
e15a72a8b8 Merge "Improve MessageQueue sync barrier implementation." 2012-02-16 19:49:03 -08:00
Jeff Brown
5a67ddae15 Merge "Encapsulate the ViewRootImpl's handler." 2012-02-16 19:43:43 -08:00
Bart Sears
1ef248acde Merge "New version of DroidSansFallback" 2012-02-16 18:01:38 -08:00
Dianne Hackborn
9ac093aa2c Merge "Revert "Don't wait for current activity to pause before resuming next."" 2012-02-16 18:01:31 -08:00
Fabrice Di Meglio
48265517fa Merge "Improve textDirection APIs" 2012-02-16 16:58:47 -08:00
Romain Guy
94f69011ea Merge "Ensure we always reset graphics modifiers Bug #6025838" 2012-02-16 16:52:53 -08:00
Fabrice Di Meglio
31809bfdbc Merge "Fix Javadoc for View" 2012-02-16 15:50:39 -08:00
Amith Yamasani
d11f8e401f Merge "Fix Power Control widget" 2012-02-16 15:48:14 -08:00
John Grossman
391b54aed6 Merge "Really fix the build this time." 2012-02-16 15:28:44 -08:00
Selim Gurun
aa31e2590f Merge "Act on credential storage updates." 2012-02-16 15:13:12 -08:00
John Grossman
7ae28728f4 Merge "Fix the build." 2012-02-16 14:57:54 -08:00
Dianne Hackborn
cd276c0018 am e669d666: am 1db7eeac: am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit 'e669d6666ae0c41742716bc2564266c1bab3f855':
2012-02-16 14:48:53 -08:00
Dianne Hackborn
c3196fc99a am 804aa297: am 01810bbb: am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '804aa297950949985882e4841303cd6e12fae06e':
  Fix last change -- don't call startInputInner() with lock held.
2012-02-16 14:48:48 -08:00
Dianne Hackborn
df6d764658 am 1db7eeac: am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '1db7eeac74d1455991e1dc0f532b47276d0c679c':
2012-02-16 14:46:41 -08:00
Dianne Hackborn
49535226c1 am 01810bbb: am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '01810bbb67b7af741b0dde0d7ccdadb76a46ed63':
  Fix last change -- don't call startInputInner() with lock held.
2012-02-16 14:45:57 -08:00
Dianne Hackborn
ed9604b365 am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '06a591cdd6d90600db006906d5d1524d156d6529':
  Fix last change -- don't call startInputInner() with lock held.
2012-02-16 14:44:03 -08:00
Dianne Hackborn
8103a941ba am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '06a591cdd6d90600db006906d5d1524d156d6529':
  Fix last change -- don't call startInputInner() with lock held.
2012-02-16 14:43:43 -08:00
Fabrice Di Meglio
22c9a2e15c Merge "Add View.onResolvePadding() as a public API" 2012-02-16 14:36:28 -08:00
Svetoslav Ganov
a278a37734 Merge "Fixing the build." 2012-02-16 14:18:46 -08:00
Svetoslav Ganov
8048afbcf7 Merge "Adding shell commands for modifying content." 2012-02-16 13:06:29 -08:00
The Android Open Source Project
8a1aab1d4f am 9f782852: am e113e793: Reconcile with ics-mr1-release
* commit '9f782852900fa02c41f825572bf45bd8bd247852':
2012-02-16 11:25:37 -08:00
The Android Open Source Project
1d71721e28 am 54b67e23: am 9777fb10: Reconcile with ics-mr1-release
* commit '54b67e23e9d7a42768598c72a287370a0f433791':
2012-02-16 11:25:16 -08:00
Justin Ho
1fd076a032 am f581e486: am eefef982: am e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1
* commit 'f581e4868b3443c6ee9a463a879ed398fb3648c9':
2012-02-16 11:25:01 -08:00
Justin Ho
7539eb5a26 am 8ff0c4cb: am 727ba648: am c470b2dd: Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1
* commit '8ff0c4cb320110e4f2d682ef352ef3eb6e0296c8':
2012-02-16 11:24:59 -08:00
Justin Ho
9e0194fc56 am c3132a0b: am ac18f89c: am e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1
* commit 'c3132a0b1ec23956ada3def4d5702f6149c68336':
  Update WiMAX notification icons Bug: 5724605
2012-02-16 11:24:57 -08:00
Eric Laurent
7a6931f5ba Merge "Fix music volume regression on tablets" 2012-02-16 10:30:51 -08:00
Mike Lockwood
d20e079845 Merge "WifiStateTracker: add support for overriding DCHP max retry count in an overlay" 2012-02-16 10:15:32 -08:00
Mike Lockwood
ed6b42766f Merge "Remove airplane mode related wifi test for Wi-Fi only devices." 2012-02-16 10:15:16 -08:00
The Android Open Source Project
824cf8190e am e113e793: Reconcile with ics-mr1-release
* commit 'e113e793b32ca4c7fe41de41c40a34c494b4c783':
2012-02-16 10:13:52 -08:00
The Android Open Source Project
4b33f90eed Reconcile with ics-mr1-release
Change-Id: I7c4496218c25c8d2b0271782ad08b4b63055ed92
2012-02-16 10:10:14 -08:00
The Android Open Source Project
868bca3ce1 am 9777fb10: Reconcile with ics-mr1-release
* commit '9777fb106f3705e2a9610c4f9020d7f68941d83c':
2012-02-16 10:04:19 -08:00
The Android Open Source Project
874c7db891 Reconcile with ics-mr1-release
Change-Id: I57beb3d2c4e7ee06eb1a14475bf05ce655cb26f3
2012-02-16 10:02:16 -08:00
Justin Ho
83bb479797 am eefef982: am e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1
* commit 'eefef98226682a1a6f4458c955b611c69b11068e':
2012-02-16 09:44:03 -08:00
Justin Ho
7e2cadbe11 am 727ba648: am c470b2dd: Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1
* commit '727ba648d66bbeeb003803afcb380cf91bcd9966':
2012-02-16 09:43:57 -08:00
The Android Automerger
04b944d66f merge in ics-mr1-release history after reset to ics-mr1 2012-02-16 09:40:11 -08:00
Justin Ho
8874123a41 am ac18f89c: am e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1
* commit 'ac18f89cf5ac8a2a63223c28139f6697d974e533':
  Update WiMAX notification icons Bug: 5724605
2012-02-16 09:31:31 -08:00
Justin Ho
b0eb468458 am 09170888: am cc1bd4bb: am c470b2dd: Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1
* commit '09170888cbc501cd9819b1caccc99592bc6dd73f':
  Part of fixing issue #6006757: Keyboard dismissal lags
2012-02-16 09:29:53 -08:00
Justin Ho
272b803811 am e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1
* commit 'e8e0527aa699c7db999b659b044d16cea6c67901':
  Update WiMAX notification icons Bug: 5724605
2012-02-16 09:29:07 -08:00
Alex Sakhartchouk
b160c7d993 Merge "Piping texture names through shader builder. Fixing uint size_t mismatch." 2012-02-16 09:28:21 -08:00
Justin Ho
db7eaa3358 am e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1
* commit 'e8e0527aa699c7db999b659b044d16cea6c67901':
  Update WiMAX notification icons Bug: 5724605
2012-02-16 09:28:12 -08:00
Justin Ho
663fb1e776 am cc1bd4bb: am c470b2dd: Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1
* commit 'cc1bd4bbbc7314ab7d3ba015c16ea78cbfd6459f':
  Part of fixing issue #6006757: Keyboard dismissal lags
2012-02-16 09:27:16 -08:00
Justin Ho
1e1a5d7820 Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1 2012-02-16 09:27:05 -08:00
Justin Ho
0520e2603e am c470b2dd: Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1
* commit 'c470b2dd49ae2c4894de22f7bdd9f91af1a085f8':
  Part of fixing issue #6006757: Keyboard dismissal lags
2012-02-16 09:25:03 -08:00
Justin Ho
7dee7fb0db am c470b2dd: Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1
* commit 'c470b2dd49ae2c4894de22f7bdd9f91af1a085f8':
  Part of fixing issue #6006757: Keyboard dismissal lags
2012-02-16 09:24:42 -08:00
Justin Ho
c7e551a13d Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1 2012-02-16 09:23:01 -08:00