Eric Laurent
fd5651c360
resolved conflicts for merge of 9ffe8338 to honeycomb-plus-aosp
...
Change-Id: I0fe9b61a2003566f7d66189a9d83ad5dd879fd7a
2011-01-21 15:46:05 -08:00
Jaikumar Ganesh
32064b6727
am c4cc3ea4: Merge "Temporary Changes for certification of SCO." into honeycomb
...
* commit 'c4cc3ea48add3b7a63a1a97fc3a4c89b24217604':
Temporary Changes for certification of SCO.
2011-01-21 15:45:54 -08:00
Jeff Brown
2866b22971
am 75a0e448: Merge "Optimize call to drawBitmap during screen rotation." into honeycomb
...
* commit '75a0e44831d08d9cbfec9f150be4e78b2d1aabf5':
Optimize call to drawBitmap during screen rotation.
2011-01-21 15:31:38 -08:00
Jeff Brown
ea5e0bb358
am cab11490: Merge "Reduce number of calls to updateInputWindows by 60%." into honeycomb
...
* commit 'cab114906df621d77bf59d9492f89182e34cd3e4':
Reduce number of calls to updateInputWindows by 60%.
2011-01-21 15:31:31 -08:00
Jeff Brown
75a0e44831
Merge "Optimize call to drawBitmap during screen rotation." into honeycomb
2011-01-21 15:29:46 -08:00
Jeff Brown
cab114906d
Merge "Reduce number of calls to updateInputWindows by 60%." into honeycomb
2011-01-21 15:29:39 -08:00
Jaikumar Ganesh
75c2701454
Temporary Changes for certification of SCO.
...
Bug: 3349475
Change-Id: I555b127a1d9218494cd05c07c9e9f29628f3bc74
2011-01-21 15:17:23 -08:00
Adam Powell
84abcfb32d
Fix bug 3374792 - Default holo dark activity background is badly
...
dithered at full size
Fix bug 3357191 - Need holo star assets
Fix bug 3357255 - Need expandable list item arrow assets
Fix bug 3373538 - Holo button padding settings difficult to work with
- remove hard padding from holo button styles. This also adds explicit
'small button' holo assets.
Fix bug 3362311 - PopupMenu with just one item has broken borders -
fix 9-patches.
Fix bug 3357195 - Need holo toggle button assets
Change-Id: I9aad9487960dc9f7e7671431ff753a6dde10908a
2011-01-21 15:16:28 -08:00
Carl Shapiro
17066b8fb2
am 8dac54c5: Merge "Perform orthogonal rotations without using a Skia canvas." into honeycomb
...
* commit '8dac54c5855cdb3334ea31ff1b5f04972515ff7f':
Perform orthogonal rotations without using a Skia canvas.
2011-01-21 15:12:14 -08:00
Carl Shapiro
8dac54c585
Merge "Perform orthogonal rotations without using a Skia canvas." into honeycomb
2011-01-21 15:09:56 -08:00
Carl Shapiro
48e8ec611a
am 366d15d5: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs."" into honeycomb
...
* commit '366d15d5425aaa090d9c1a1d7273f13e2c85c43b':
Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."
2011-01-21 15:08:04 -08:00
Carl Shapiro
366d15d542
Merge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."" into honeycomb
2011-01-21 15:05:26 -08:00
Nick Pelly
a4f26c3d03
am 4d3ac03a: am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread
...
* commit '4d3ac03ade6184504ad3881def5e86133ae5f2f6':
hange the default IsoDep timeout to 300ms (docs update).
2011-01-21 15:03:19 -08:00
Mathias Agopian
80f3376b3a
am b92a40eb: am 12d014fd: Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread
...
* commit 'b92a40ebfaf49783f942b75b413e1499e149c3bb':
fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE
2011-01-21 15:02:26 -08:00
Amith Yamasani
d75ee6f13a
am 7c93e52f: (-s ours) am 68153821: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true." into gingerbread
...
* commit '7c93e52fac25fb76a67a82f1ccaa4ff6ad42e6ed':
Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true.
2011-01-21 15:02:18 -08:00
Fabrice Di Meglio
795f135a08
Fix bug #3338957 (Account Picker and Account type picker need love)
...
- update UI to match design requirements
Change-Id: Idb5dbea876eb7170a8c1f077a99cfe168d41f1e1
2011-01-21 14:58:02 -08:00
Gilles Debunne
48617a5134
am b5e5b2d9: Merge "Tapping inside an EditText should always pop up the IME." into honeycomb
...
* commit 'b5e5b2d99b6b56798f863b24b786c351d9b22cf3':
Tapping inside an EditText should always pop up the IME.
2011-01-21 14:55:50 -08:00
Gilles Debunne
b5e5b2d99b
Merge "Tapping inside an EditText should always pop up the IME." into honeycomb
2011-01-21 14:53:44 -08:00
Carl Shapiro
d6c276a5ef
Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."
...
This reverts commit 90c656574175bd54ed8d258f406f158177e5e91c.
Bug: 3378444
Change-Id: Id845bc0bc213f18c73fec12e6a2084cb2075c2d9
2011-01-21 14:52:51 -08:00
Amith Yamasani
610dff54fc
am b58b5db4: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb
...
* commit 'b58b5db4ba8edc075f6524df200aa8d3c678e267':
Set the default state of NOTIFICATIONS_USE_RING_VOLUME.
2011-01-21 14:49:34 -08:00
Michael Kolb
b2b830774f
am debb5bbe: Merge "Add public API for on screen zoom controls" into honeycomb
...
* commit 'debb5bbe816ce764ecda73eabc17c31fd59fbe3e':
Add public API for on screen zoom controls
2011-01-21 14:49:30 -08:00
Amith Yamasani
b58b5db4ba
Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb
2011-01-21 14:47:32 -08:00
Michael Kolb
debb5bbe81
Merge "Add public API for on screen zoom controls" into honeycomb
2011-01-21 14:47:30 -08:00
Carl Shapiro
ae12a50a35
Perform orthogonal rotations without using a Skia canvas.
...
Bug: 3371653
Change-Id: I315f671c0016f61417ff7c2a98d2c96f6b243bdf
2011-01-21 14:45:14 -08:00
Andreas Huber
3564d9eada
am 63d64a14: Merge "Properly rotate video that\'s marked as such and decoded to a surface." into honeycomb
...
* commit '63d64a14790ae21db31b60747864b4a7565b33c3':
Properly rotate video that's marked as such and decoded to a surface.
2011-01-21 14:44:21 -08:00
Andreas Huber
63d64a1479
Merge "Properly rotate video that's marked as such and decoded to a surface." into honeycomb
2011-01-21 14:42:22 -08:00
Jeff Brown
8db9ac4b7d
Optimize call to drawBitmap during screen rotation.
...
Using SRC mode reduces drawBitmap time from 50ms to 15ms.
Change-Id: Ibde82f358d92bd330b8c78c9db1ded6a0b4ba135
2011-01-21 14:39:52 -08:00
Irfan Sheriff
135531b20a
am ef76b830: am 4170b463: Merge "Do not add unsolicited events to queue" into gingerbread
...
* commit 'ef76b8306fd6147d9dd7e3b7dce10354eff8033c':
Do not add unsolicited events to queue
2011-01-21 14:37:14 -08:00
Jeff Brown
4f76290026
am b26c516c: (-s ours) am 41395459: Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread
...
* commit 'b26c516c03beffaf60460d3589b3807c0799c344':
Filter virtual keys after touches. (DO NOT MERGE)
2011-01-21 14:37:07 -08:00
Brad Fitzpatrick
7f1b722dd1
am 02bbbc11: am 069e810c: Merge "Fixing memory leak in PreferenceScreen."
...
* commit '02bbbc1122eac6ab02c10c3c1bb34092914e3743':
Fixing memory leak in PreferenceScreen.
2011-01-21 14:36:54 -08:00
Brad Fitzpatrick
8a82de2fca
am 4bb180d6: am ded2b006: Merge "frameworks/base: remove redundant code in WindowManager"
...
* commit '4bb180d62f71658d04a7d6800707de83c10b01a5':
frameworks/base: remove redundant code in WindowManager
2011-01-21 14:36:43 -08:00
Martijn Coenen
ed0c705f3e
am c4eee776: am 07e6f616: Check NDEF before calling makeReadOnly().
...
* commit 'c4eee776ad9d3de99032984fe20f5de395888bc7':
Check NDEF before calling makeReadOnly().
2011-01-21 14:36:33 -08:00
Nick Pelly
ed8bb922c2
Merge "resolved conflicts for merge of 3d06b1e0 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-01-21 14:34:03 -08:00
Leon Scroggins
12871245c7
am 60130138: Merge "Restart input when the webpage changes the text." into honeycomb
...
* commit '6013013829d1f97970d3ed426006d2522303826f':
Restart input when the webpage changes the text.
2011-01-21 14:33:03 -08:00
Andreas Huber
5e9dc94a3c
Properly rotate video that's marked as such and decoded to a surface.
...
Change-Id: I1e9144db3447e58c99aac3f47702ad471678789c
related-to-bug: 3378148
2011-01-21 14:32:31 -08:00
Jason Sams
0629ac78fc
am 8418474d: Merge "fix bug 3375251 Copying arrays of objects would generate an exception due to excessive internal type checking." into honeycomb
...
* commit '8418474dab412596c44c71497c0f4a3c39de597e':
fix bug 3375251 Copying arrays of objects would generate an exception due to excessive internal type checking.
2011-01-21 14:30:56 -08:00
Leon Scroggins
6013013829
Merge "Restart input when the webpage changes the text." into honeycomb
2011-01-21 14:30:50 -08:00
Jason Sams
8418474dab
Merge "fix bug 3375251 Copying arrays of objects would generate an exception due to excessive internal type checking." into honeycomb
2011-01-21 14:28:55 -08:00
Yu Shan Emily Lau
58fc2d39e8
am 588b1e45: Merge "Change the default ssid from GoogleGuest to the opennet for the power test." into honeycomb
...
* commit '588b1e4511d67f080449c3d49fd0d4bfc2bec79f':
Change the default ssid from GoogleGuest to the opennet for the power test.
2011-01-21 14:28:52 -08:00
Yu Shan Emily Lau
588b1e4511
Merge "Change the default ssid from GoogleGuest to the opennet for the power test." into honeycomb
2011-01-21 14:27:06 -08:00
Michael Kolb
5840cd294a
Add public API for on screen zoom controls
...
http://b/issue?id=3378224
This is a simple unhide.
Allow the use of WebView pinch-to-zoom gestures
without the on screen zoom controls.
Currently, enabling pinch to zoom with the public API also shows the
on screen zoom buttons.
If the zoom buttons are not wanted, a custom implementation of pinch to
zoom is required, which can't be done correctly at this point.
Change-Id: I3f94080471c3a4b498b11c91603fff9994dc3c2c
2011-01-21 14:15:16 -08:00
Leon Scroggins
a51063c059
Restart input when the webpage changes the text.
...
Bug:3375518
Change-Id: I0a18d0ca764ce428d86bd5f6d13f8764668acea6
2011-01-21 17:14:36 -05:00
Jeff Brown
3a22cd90bc
Reduce number of calls to updateInputWindows by 60%.
...
Change-Id: Ida9069dd58be2070f3c9d312aa9d868bd98eb8e2
2011-01-21 14:09:43 -08:00
Yu Shan Emily Lau
3d273da8fa
Change the default ssid from GoogleGuest to the opennet for the power test.
...
Change-Id: I63bae360d283dc5224790aaccbd879015402187d
2011-01-21 14:06:22 -08:00
Nick Pelly
8bb36dbbf3
resolved conflicts for merge of 3d06b1e0 to honeycomb-plus-aosp
...
Change-Id: Idd58a1d4e9b9156e123ccbcbc17a59eedd46af4c
2011-01-21 14:01:54 -08:00
Dianne Hackborn
4eba96bb31
Fix issue #3377999 : Activities need to be stopped when sleeping
...
This is a band-aid over the existing kludgy stopping mechanism
where the semantics of stop are different in the activity manager
than in the clients.
This change is intended to be as unobtrusive as possible, only
impacting the sleep case. I have a different change that
completely reworks how we stop activities to simply this all
a lot by unifying the semantics between the server and client.
However, it is too late in HC for such an extensive change. Later
I'll revert this one and put in the better solution.
Change-Id: Id77f2db1ec83469cdd888acb8fbc4679daa7766e
2011-01-21 13:42:26 -08:00
Gilles Debunne
c3e85a712b
Tapping inside an EditText should always pop up the IME.
...
Bug 3374062
When the tap in slightly off the EditText, it receives focus from its parent layout
which dispatches the event. However, the touch event is (correctly) not propagated
in that case.
onFocusChanged should hence do actions similar to what is done on touch up events.
Change-Id: Ia5c04546674fc6239aa4d0b8d051f4951ca91352
2011-01-21 13:35:29 -08:00
Romain Guy
11ad95c49b
am d8b9d7cd: Merge "Don\'t set a Toast\'s view to null when enqueued several times. Bug #3374386 " into honeycomb
...
* commit 'd8b9d7cd1b2327b02e41edcddf94e64d481419d1':
Don't set a Toast's view to null when enqueued several times. Bug #3374386
2011-01-21 13:25:02 -08:00
Romain Guy
d8b9d7cd1b
Merge "Don't set a Toast's view to null when enqueued several times. Bug #3374386 " into honeycomb
2011-01-21 13:23:25 -08:00
Andreas Huber
9a62d902ea
am 05aa0827: Merge "Some tweaks to HTTP live / nuplayer behaviour" into honeycomb
...
* commit '05aa082770d812c5921d6b2f9b3559f1fd1536a8':
Some tweaks to HTTP live / nuplayer behaviour
2011-01-21 13:17:42 -08:00