Justin Ho
3e3175428c
Merge "Updated textfield search assets Bug: 3321263" into honeycomb-mr1
2011-03-14 18:23:18 -07:00
Justin Ho
4a21cabb9f
Fixing naming for disabled paste assets
...
Updated paste assets
Bug: 4083486
Change-Id: I21bc469ef42c4eca4bcbea953f3c9e3a72b13388
2011-03-14 18:19:25 -07:00
Romain Guy
b245e31fa8
am ee7ace06: Merge "Fix rendering artifact in edge fades. Bug #4092053 " into honeycomb-mr1
...
* commit 'ee7ace065f77b53a57cb6273b9f2f5d85caba90c':
Fix rendering artifact in edge fades. Bug #4092053
2011-03-14 18:18:03 -07:00
Romain Guy
ee7ace065f
Merge "Fix rendering artifact in edge fades. Bug #4092053 " into honeycomb-mr1
2011-03-14 18:16:39 -07:00
Romain Guy
7b5b6abf85
Fix rendering artifact in edge fades.
...
Bug #4092053
The problem always existed but was made visible by partial invalidation.
When saving a layer, the renderer would try to postpone glClear()
operations until the next drawing command. This however does not work
since the clip might have changed. The fix is rather simple and
simply gets rid of this "optimization" (that turned out to be
usless anyway given how View issues saveLayer() calls.)
This change also fixes an issue with gradients (color stops where
not properly computed when using a null stops array) and optimizes
display lists rendering (quickly rejects larger portions of the
tree to avoid executing unnecessary code.)
Change-Id: I0f5b5f6e1220d41a09cc2fa84c212b0b4afd9c46
2011-03-14 18:05:08 -07:00
Justin Ho
db92972c53
Updated HTML5 media playback controls
...
Bug: 4080127
Change-Id: I89e7822f18c11536aea92adf4a01a5af61ed1186
2011-03-14 18:01:36 -07:00
Adam Powell
a0def7223f
Fix bug 4099023 - Phantom clicks on some websites
...
Don't forward touch events when webkit has already claimed it doesn't
want them.
Change-Id: Ib00f9014bb23ff544dde6ec9a50ce71ebcb2bb26
2011-03-14 17:54:10 -07:00
Mike Lockwood
0958fb1068
am 221830b9: Merge "Add support for USB accessory serial numbers" into honeycomb-mr1
...
* commit '221830b93d6f35bcf20db2d34978392b43f44221':
Add support for USB accessory serial numbers
2011-03-14 17:41:22 -07:00
Mike Lockwood
015b1ecaec
Add support for USB accessory serial numbers
...
Change-Id: I47b79f091b300ced60bfc61eff2f771139663aae
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-14 20:10:47 -04:00
Nicolas Roard
373ece1fa1
am 65c28204: Merge "Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)" into honeycomb-mr1
...
* commit '65c282042dab1dfa75b10517190ba38834782c3b':
Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)
2011-03-14 15:39:37 -07:00
Nicolas Roard
b6866f81a9
am 0fd8fa33: Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1
...
* commit '0fd8fa33e28df28568532c30f53a91a8d652b35d':
Adding placeholders for the fullscreen button used by the browser for HTML5 video
2011-03-14 15:21:46 -07:00
Nicolas Roard
3efaa34015
Adding placeholders for the large play button
...
used by the browser for HTML5 video (the button will appear
surimposed to the video)
bug:4080127
Change-Id: I681d2a4a3de1b2db64ffb3bbf4ce883320c771f1
2011-03-14 15:14:28 -07:00
Nicolas Roard
0fd8fa33e2
Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1
2011-03-14 15:11:55 -07:00
Amith Yamasani
7341727e8e
Use more padding on the sides for SearchView
...
Bug: 4088716
Change-Id: I2e49a38939c13a5fa57333dc745a82fdf3ead8f8
2011-03-14 14:54:04 -07:00
Huahui Wu
9691d3f318
am b71020ef: Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1
...
* commit 'b71020ef4018195a21d2538ea3767b901610daf4':
b/3392594 keep the remain touch points when one is ended.
2011-03-14 14:46:27 -07:00
Eric Fischer
d5e8dae883
Import revised translations. DO NOT MERGE
...
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
2011-03-14 14:44:41 -07:00
Scott Main
c899d32e8b
docs: update search dev guide with SearcView widget
...
Change-Id: Ieb0ccdb78760a3c90df2381e647463f7532b0efc
2011-03-14 14:44:41 -07:00
Eric Fischer
e0b33ce0c3
Add "new incognito window" translations.
...
These are all unfortunately for the "window" version instead of the
"tab" version because I didn't realize that there were two versions.
Change-Id: If9a4bd6d0d70fe8992b4bf63e674865080f8c597
2011-03-14 14:44:40 -07:00
Huahui Wu
b71020ef40
Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1
2011-03-14 14:43:46 -07:00
Scott Main
462012db70
am abdf0d53: docs: update search dev guide with SearcView widget
...
* commit 'abdf0d533c292709e51cee2c1213d5e44baca963':
docs: update search dev guide with SearcView widget
2011-03-14 14:36:56 -07:00
Dianne Hackborn
cf3004a46e
Add some debug code to try to track down issue 3183612
...
java.lang.SecurityException: Neither user 1209 nor current process
has android.permission.WAKE_LOCK.
Change-Id: I3e84f8795941744e697824a5e5b2e651f565b253
2011-03-14 14:24:04 -07:00
Justin Ho
5e6b4b0392
Updated textfield search assets
...
Bug: 3321263
Change-Id: I3e453f5d969cc94b11ec51a3807bc74948473833
2011-03-14 14:19:17 -07:00
Eric Fischer
175121a513
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-14 14:17:01 -07:00
Eric Fischer
9f70f5268f
Merge "Add "new incognito window" translations." into honeycomb-mr1
2011-03-14 14:13:29 -07:00
Eric Fischer
7b31d5c84f
Import revised translations. DO NOT MERGE
...
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
2011-03-14 14:06:03 -07:00
Nicolas Roard
5ee534cf88
Adding placeholders for the fullscreen button
...
used by the browser for HTML5 video
bug:4080127
Change-Id: I8fedef7eb0442de547ff083f15f6fcc7a9fea791
2011-03-14 13:59:04 -07:00
Ramesh Sudini
c06c5c1a13
Do not merge: Telephony: Fix config to reflect the correct CM conn type.
...
Reflect the correct connectivity manager connection type in the config.xml.
Change-Id: Ida4d0a6275addda6fe11878fa96dbac70283df91
2011-03-14 13:44:30 -07:00
Wink Saville
c3853f3664
Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE
2011-03-14 13:41:26 -07:00
Wink Saville
c15cf6353e
Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE
2011-03-14 13:40:58 -07:00
Mike Lockwood
ccdac700df
am 78b8e1be: Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread
...
* commit '78b8e1be97c61f7e0b28b145fadd0c646fd1c46b':
DO NOT MERGE: backport recent USB accessory changes from honeycomb
2011-03-14 13:37:54 -07:00
Simon Wilson
81e1ed7eb5
am ee3f6ef2: Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread
...
* commit 'ee3f6ef2fc7bcfae9d8af8430760388f653a10c8':
DO NOT MERGE Support WiMAX Settings & ticker message
2011-03-14 13:34:18 -07:00
Scott Main
abdf0d533c
docs: update search dev guide with SearcView widget
...
Change-Id: Ieb0ccdb78760a3c90df2381e647463f7532b0efc
2011-03-14 13:27:53 -07:00
Huahui Wu
2d3ef37ae6
b/3392594 keep the remain touch points when one is ended.
...
This is the Java side code change for b/3392594.
It adds an action index into the touch event data and pass it
to the native side.
Change-Id: Ibb393e62a590d0fff1dd3172041748e2b10501d6
2011-03-14 13:21:23 -07:00
Mike Lockwood
78b8e1be97
Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread
2011-03-14 13:17:24 -07:00
Gilles Debunne
816dd3d443
resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp
...
Change-Id: I7f9c71eeb9fc5e01856f764930c6f168741cc9da
2011-03-14 12:57:01 -07:00
Robert Greenwalt
04cac40ff8
Do not merge: Add some input checking to prevent problems
...
Adding nulls can cause unhappiness. It's suspected as a cause of 3495045.
bug:3495045
Change-Id: I925c965ef64032fc57849bf15fe9b11f4bc99351
2011-03-14 12:25:09 -07:00
Wink Saville
9d7d62801d
Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
...
This reverts commit eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7
and is the first of the LTE commits in master being back ported
to the LTE branch.
Change-Id: I17d4a1b779ed74bc7dfb409d2c1a30f60fdb27c7
2011-03-14 12:25:04 -07:00
Simon Wilson
ee3f6ef2fc
Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread
2011-03-14 11:40:17 -07:00
TK MUN
9999ad20df
DO NOT MERGE Support WiMAX Settings & ticker message
...
Change to save UI setting value
Add new Icons for ticker message
Change-Id: I3294f40c9853311f74877e197675f48bf271d468
2011-03-14 11:39:01 -07:00
Gilles Debunne
9c06c0ffc9
Merge "Double tap on a word no longer opens context menu. DO NOT MERGE" into gingerbread
2011-03-14 11:30:17 -07:00
Gilles Debunne
f2f3627f65
am 8503af84: Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1
...
* commit '8503af848657356411a9bb4cf15d798d4f15111b':
Paste popup uses a disabled icon when there is nothing to paste.
2011-03-14 11:27:54 -07:00
Gilles Debunne
8503af8486
Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1
2011-03-14 11:26:36 -07:00
Eric Fischer
5ce32d9fde
Add "new incognito window" translations.
...
These are all unfortunately for the "window" version instead of the
"tab" version because I didn't realize that there were two versions.
Change-Id: If9a4bd6d0d70fe8992b4bf63e674865080f8c597
2011-03-14 11:17:02 -07:00
Nick Pelly
a64e2ad4da
resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp
...
Change-Id: Iff9ea08b810b0d142a9227272492c0305a9bcf42
2011-03-14 10:28:11 -07:00
Mike Lockwood
151c74b3c6
am e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1
...
* commit 'e976ff4a2203e5a01c9a1c1a018ba9e5ab7777f7':
Add a dialog to ask user to start an application for a USB device or accessory
2011-03-14 06:55:24 -07:00
Mike Lockwood
bce6f8f249
Add a dialog to ask user to start an application for a USB device or accessory
...
This is used when there is only one application available and the user has
not chosen to start it by default.
If more than one application is available we continue to use UsbResolverActivity
Bug: 4074719
Change-Id: Id61f2ccc6de5b9ac70fb4670006ff1fee2028d55
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-13 19:18:08 -04:00
Dianne Hackborn
ce3bcbade5
am 9ff64838: Merge "Fix issues #4087362 and #4087356 " into honeycomb-mr1
...
* commit '9ff6483843bfa23751b1acf32b169fca9ad97f7f':
Fix issues #4087362 and #4087356
2011-03-11 18:04:04 -08:00
Dianne Hackborn
9ff6483843
Merge "Fix issues #4087362 and #4087356 " into honeycomb-mr1
2011-03-11 18:01:47 -08:00
Mike Lockwood
3b473d958c
am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1
...
* commit '9fffd9a8bb73e9b225878686862d49b27e98c659':
USB: minor cleanup work
2011-03-11 17:54:23 -08:00
Mike Lockwood
9fffd9a8bb
Merge "USB: minor cleanup work" into honeycomb-mr1
2011-03-11 17:52:36 -08:00