The Android Open Source Project
9f78285290
am e113e793: Reconcile with ics-mr1-release
...
* commit 'e113e793b32ca4c7fe41de41c40a34c494b4c783':
2012-02-16 10:13:52 -08:00
The Android Open Source Project
e113e793b3
Reconcile with ics-mr1-release
...
Change-Id: I7c4496218c25c8d2b0271782ad08b4b63055ed92
2012-02-16 10:10:14 -08:00
The Android Open Source Project
54b67e23e9
am 9777fb10: Reconcile with ics-mr1-release
...
* commit '9777fb106f3705e2a9610c4f9020d7f68941d83c':
2012-02-16 10:04:19 -08:00
The Android Open Source Project
9777fb106f
Reconcile with ics-mr1-release
...
Change-Id: I57beb3d2c4e7ee06eb1a14475bf05ce655cb26f3
2012-02-16 10:02:16 -08:00
Justin Ho
f581e4868b
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
8ff0c4cb32
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
2c7933bb96
merge in ics-mr1-release history after reset to ics-mr1
2012-02-16 09:40:11 -08:00
Justin Ho
c3132a0b1e
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
ac18f89cf5
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
Justin Ho
eefef98226
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
09170888cb
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
e8e0527aa6
Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1
2012-02-16 09:27:05 -08:00
Justin Ho
727ba648d6
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
cc1bd4bbbc
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
c470b2dd49
Merge "Part of fixing issue #6006757 : Keyboard dismissal lags" into ics-mr1
2012-02-16 09:23:01 -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
Dianne Hackborn
a82ba54b0b
Part of fixing issue #6006757 : Keyboard dismissal lags
...
This adjust various paths through InputMethodManager so that the flow
in switching focus from one application to another is cleaner, resulting
in less work being done, resulting in it being able to happen quicker.
Some of the changes here avoid doing stuff when not needed, such as when
we are told to unbind but are not currently the active input. A big part
is also a change to the flow when a window receives input. Previously
this would first do a checkFocus() which would tell the input method to
switch focus to whatever view has focus in the window, followed by the
windowGainedFocus() call telling it the window had gained focus. This
would result in extra work because the input method service would first
handle the focus switch, seeing the IME is currently displayed, so the IME
would remain up and reset its focus to the new view. The app would
immediately then tell it about the window, causing the service to find out
the IME should be hidden and telling the IME, but the IME couldn't hide
itself until it had first take care of switching its input.
There is the definite potential of this breaking IME showing/hiding in
cases depending on the order things may be relying on them to happen. I
haven't seen any problems with a brief trip through the UI.
Change-Id: I8494cbd6e19e2ab6db03f2463d9906680dda058b
2012-02-15 18:19:55 -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
Justin Ho
aefa9219c1
Update WiMAX notification icons
...
Bug: 5724605
Change-Id: I03f9c2e7c9e94f1d3dc38d9eee3c90c45c0422a6
2012-02-15 14:59:53 -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
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
Scott Main
27790d98d7
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:27 -08:00
Scott Main
2670332678
docs: Google+ badge now sizes properly; remove reposition hack
...
Change-Id: If5e402b8acb249e0ea81436f3d5ecf468934b81f
2012-02-15 13:22:30 -08:00
Robert Greenwalt
1b2583c41c
am 7874efeb: am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
...
* commit '7874efeb138204230475720d0b97f2d199a21502':
Stop using shared DUN APN when tethering stops.
2012-02-14 16:25:11 -08:00
Robert Greenwalt
7a08ef442a
am e3776a47: am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1
...
* commit 'e3776a47dbebc8195edeac39f7f4ce3e08b59bec':
Add a config to set Dun capabilities.
2012-02-14 16:25:09 -08:00
Justin Ho
d9a19ffa1f
am e6ccc94e: am c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1
...
* commit 'e6ccc94ef9825360d8993553b30dcaa0f342c871':
Update 4G WiMAX assets for notification area as well Bug: 5724605
2012-02-14 16:25:08 -08:00
The Android Automerger
da05ab5c3b
merge in ics-mr1-release history after reset to ics-mr1
2012-02-14 14:15:44 -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
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
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
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
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
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