67663 Commits

Author SHA1 Message Date
Alex Sakhartchouk
791c0d188a Merge "Piping texture names through shader builder. Fixing uint size_t mismatch." 2012-02-16 09:28:21 -08:00
Scott Main
dbbb175258 am 22182aa3: am 9fc057aa: am 2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to t
* commit '22182aa3f7bc41c401bcb63fe6c86b735573cc07':
2012-02-16 07:34:11 -08:00
Scott Main
d3b08d1409 am f72a0e71: am 27790d98: am 26703326: docs: Google+ badge now sizes properly; remove reposition hack
* commit 'f72a0e71b9793c41aca2bf20306b3c71c0570eab':
2012-02-16 07:34:09 -08:00
Robert Greenwalt
ff3dfc554d am 70c10e20: am 3fd0ed8d: am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
* commit '70c10e2059e5bb8d882cda7cf1691793d83789ca':
2012-02-16 07:34:07 -08:00
Robert Greenwalt
f6112b558a am 23f278fc: am 84d8eed0: am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1
* commit '23f278fc96bdab8bab606a47706132a31985c202':
2012-02-16 07:34:05 -08:00
Justin Ho
5d6be69a54 am a7112d0e: am 8a3bf559: am c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1
* commit 'a7112d0efebb50c373464d9ac96340997d5e9cdb':
2012-02-16 07:34:03 -08:00
Michael Jurka
fea6f03842 Merge "Minor public.xml cleanup" 2012-02-16 00:10:10 -08:00
Michael Jurka
4a4bcfde4b Minor public.xml cleanup
Change-Id: Iad29e32aedd099dc47da25368a29c46d4f4babac
2012-02-16 00:07:42 -08:00
Stephen Hines
408ff24bac Merge "Vectors of non-primitive types are not allowed." 2012-02-15 23:05:18 -08:00
Stephen Hines
3beb60e67a Vectors of non-primitive types are not allowed.
BUG=6016669

Change-Id: Ibab2dfc5ce3d9ceb5513e6b5ffc53d5df8b7c6e7
2012-02-15 19:07:43 -08:00
Selim Gurun
d8d6afdc06 Merge "Revert "Act on credential storage updates."" 2012-02-15 19:04:58 -08:00
Selim Gurun
43e41580e4 Revert "Act on credential storage updates."
This reverts commit fcd93b72a3dde2b20fa0d8b04d3f47311b0856a1
2012-02-15 19:04:04 -08:00
Romain Guy
8963822068 Merge "Prevent AutoCompleteTextView from opening a popup when it shouldn't Bug #5553515" 2012-02-15 18:36:55 -08:00
Scott Main
22182aa3f7 am 9fc057aa: am 2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device set
* commit '9fc057aab4f08e5a40de665549f48bece0c7bd63':
2012-02-15 18:36:00 -08:00
Scott Main
f72a0e71b9 am 27790d98: am 26703326: docs: Google+ badge now sizes properly; remove reposition hack
* commit '27790d98d7c1f1804fda431bea1004c0e385da7a':
2012-02-15 18:35:56 -08:00
Robert Greenwalt
70c10e2059 am 3fd0ed8d: am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
* commit '3fd0ed8d84e6901ddd50fbf0012496bda235e552':
2012-02-15 18:35:41 -08:00
Robert Greenwalt
23f278fc96 am 84d8eed0: am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1
* commit '84d8eed0d27bae6e6a99a0e73ff71af80edae4d8':
2012-02-15 18:35:39 -08:00
Justin Ho
a7112d0efe am 8a3bf559: am c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1
* commit '8a3bf55942f3a6c6a20bd8be03c142ef986600b5':
2012-02-15 18:35:36 -08:00
Romain Guy
c27cc01f6a Prevent AutoCompleteTextView from opening a popup when it shouldn't
Bug #5553515

The People app is forcing ACTV to show the IME which had the side effect
of showing the drop down popup. ACTV was unfortunately not ready to show
the drop down if the filtering resulted in no results. Doing so was putting
ACTV in a weird state that in turn caused a window to be leaked and really
bad behavior to occur in the lower graphics levels.

Change-Id: I2ff146d5ae4e4a28edf6ea17039c9f8fdb710e4f
2012-02-15 18:34:37 -08:00
John Reck
d22bf4b09a Merge "Initial support for keyboard navigation" 2012-02-15 18:04:16 -08:00
Selim Gurun
e83b83fe20 Merge "Act on credential storage updates." 2012-02-15 17:48:12 -08:00
Scott Main
ada8c18b2d am 3b3a5b52: am 09af1ade: am 2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to t
* commit '3b3a5b52a7f586f02daba75c5ad982265b72411c':
  docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs.
2012-02-15 17:39:46 -08:00
Scott Main
3b3a5b52a7 am 09af1ade: am 2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device set
* commit '09af1aded6dacf35cf54597cd81a636337bd9c9c':
  docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs.
2012-02-15 17:36:54 -08:00
Scott Main
09af1aded6 am 2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also;
* commit '2a1d19174e32bb6056086ec603948cd476a2ea67':
  docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs.
2012-02-15 17:34:09 -08:00
Scott Main
9fc057aab4 am 2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also;
* commit '2a1d19174e32bb6056086ec603948cd476a2ea67':
  docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs.
2012-02-15 17:33:15 -08:00
Scott Main
2a1d19174e Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs." into ics-mr1 2012-02-15 17:31:54 -08:00
Scott Main
811aca5513 docs: move USB installation info into the OEM USB Drivers document because
the Google USB Driver is deprecated, so consolidating the USB info makes more sense
for the common case of needing an OEM driver
A few changes to the device setup doc also; such as removing the "unknown sources"
step, because that doesn't apply to adb installs.

Change-Id: Ice78c997cbb147865ead78fb037d0b6b64db75bd
2012-02-15 16:46:10 -08:00
Romain Guy
f7280ccbfe Merge "Add a compile time condition to remove unnecessary code" 2012-02-15 16:41:29 -08:00
Romain Guy
fe455af277 Add a compile time condition to remove unnecessary code
Change-Id: Ia44916af8e22e548fbb62cb2b53da285d5959102
2012-02-15 16:40:20 -08:00
Alex Sakhartchouk
2123b46ba8 Piping texture names through shader builder.
Fixing uint size_t mismatch.

Change-Id: Ia7c8bd9f829deaa50e1cc381ccd50f29676bbdfb
2012-02-15 16:21:46 -08:00
Kenny Root
687bdf0ae1 Move keystore to system/security repo
Move keystore to system/security at revision
a91203b08350b2fc7efda5b1eab39e7541476b3a

Change-Id: I7dbd625b864e9c63489b08e9fd28dfb22da81072
2012-02-15 15:55:21 -08:00
Jeff Brown
57ff581bd9 Merge "Keep the display event receiver around forever." 2012-02-15 15:44:14 -08:00
Jeff Brown
1654d0b8d9 Keep the display event receiver around forever.
There is really no point disposing the display event receiver
anymore.  Moreover, it's hard to choose a good time to do it
since the Choreographer only supports one-shot callbacks now.

So let's made the code simpler.

Bug: 5721047
Change-Id: I8533a54e93a787e0ca30d99a1f1eea85534b13b9
2012-02-15 15:40:52 -08:00
Jeff Brown
c4c0a22ae9 Merge "Simplify Choreographer API." 2012-02-15 15:37:49 -08:00
Fabrice Di Meglio
019ace3ebf Merge "Fix the build" 2012-02-15 15:37:21 -08:00
Fabrice Di Meglio
aba0336170 Fix the build
Change-Id: I7c6a2536e894efde951e70188597f39811e2091f
2012-02-15 15:30:37 -08:00
Stephen Hines
f6fb3ab8c0 Merge "Update Element.isCompatible() to work with NONE." 2012-02-15 15:21:01 -08:00
Alex Sakhartchouk
6be163651c Merge "Fixing uint32 size_t mismatches." 2012-02-15 15:14:21 -08:00
Jeff Brown
4a06c8008b Simplify Choreographer API.
Removed the listeners and schedule animation / draw methods.
Instead all requests are posted as one-shot callbacks, which is a
better match for how clients actually use the Choreographer.

Bug: 5721047
Change-Id: I113180b2713a300e4444d0d987f52b8157b7ac15
2012-02-15 15:06:01 -08:00
Fabrice Di Meglio
54546f22fb Make MarginLayoutParams startMargin and endMargin API public
Change-Id: I519f8ede818b068883ee1565d28e188298af9f0e
2012-02-15 14:54:48 -08:00
Scott Main
308b1eaa0a am deb92c61: am fc28fbd4: am 26703326: docs: Google+ badge now sizes properly; remove reposition hack
* commit 'deb92c612bc4b91be8f85da06c618c64b1cd20a8':
  docs: Google+ badge now sizes properly; remove reposition hack
2012-02-15 14:24:07 -08:00
Jesse Wilson
3200d086a6 Merge "Implement the (hidden) ExtendedResponseCache interface." 2012-02-15 14:17:55 -08:00
Eric Fischer
5c447e6b7c Restore deleted strings still referenced from public.xml to fix the build.
Change-Id: I613c28133152f08cd82c435640aea7680282c2d2
2012-02-15 14:06:28 -08:00
Fabrice Di Meglio
c46a5f0267 Merge "Make View paddingStart and paddingEnd API public" 2012-02-15 13:59:27 -08:00
Fabrice Di Meglio
2c884826b2 Make View paddingStart and paddingEnd API public
Change-Id: I39fd987c866e8bfadbaa9a29c0e38b3b7ce03f7e
2012-02-15 13:57:09 -08:00
Jesse Wilson
18c227ba72 Implement the (hidden) ExtendedResponseCache interface.
Bug: http://code.google.com/p/android/issues/detail?id=25418
Change-Id: I4b20d576bac7036f94e57db7124de44f5b8d75be
2012-02-15 16:53:57 -05:00
Eric Fischer
5093b63ffb Merge "Import translations." 2012-02-15 13:35:14 -08:00
Scott Main
deb92c612b am fc28fbd4: am 26703326: docs: Google+ badge now sizes properly; remove reposition hack
* commit 'fc28fbd4e2ccac932f6a72370d4bf4f4d043d49d':
  docs: Google+ badge now sizes properly; remove reposition hack
2012-02-15 13:29:54 -08:00
Eric Fischer
942a30c30d Import translations.
Change-Id: I7ae04712d8ec088c38cb55b6152197896d18c620
2012-02-15 13:28:07 -08:00
Scott Main
fc28fbd4e2 am 26703326: docs: Google+ badge now sizes properly; remove reposition hack
* commit '26703326784a6de45830236bd0a97345f93448d4':
  docs: Google+ badge now sizes properly; remove reposition hack
2012-02-15 13:26:51 -08:00