Justin Ho
c460a3f61b
am 1586c133: am cc886b93: Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1
...
* commit '1586c133a3305045af277b69fec6f0f14bb234df':
Fixing naming for disabled paste assets Updated paste assets
2011-03-14 18:31:06 -07:00
Justin Ho
86269a1e7e
am 7bc341cf: am 3e317542: Merge "Updated textfield search assets Bug: 3321263" into honeycomb-mr1
...
* commit '7bc341cf80fb5d6b4a8a3304c672341ed9810825':
Updated textfield search assets Bug: 3321263
2011-03-14 18:31:03 -07:00
Justin Ho
1586c133a3
am cc886b93: Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1
...
* commit 'cc886b93681b75a9b89331930435e0f527b2c3d7':
Fixing naming for disabled paste assets Updated paste assets
2011-03-14 18:25:43 -07:00
Justin Ho
7bc341cf80
am 3e317542: Merge "Updated textfield search assets Bug: 3321263" into honeycomb-mr1
...
* commit '3e3175428c81501d72cda3c026b927ca6408243f':
Updated textfield search assets Bug: 3321263
2011-03-14 18:25:40 -07:00
Justin Ho
cc886b9368
Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1
2011-03-14 18:24:06 -07:00
Justin Ho
3e3175428c
Merge "Updated textfield search assets Bug: 3321263" into honeycomb-mr1
2011-03-14 18:23:18 -07:00
Romain Guy
8329db39f2
am b245e31f: am ee7ace06: Merge "Fix rendering artifact in edge fades. Bug #4092053 " into honeycomb-mr1
...
* commit 'b245e31fa8dd1ad6a59ccf858154f3c7b92e0eb8':
Fix rendering artifact in edge fades. Bug #4092053
2011-03-14 18:21:21 -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
Mike Lockwood
688d8412bd
am 0958fb10: am 221830b9: Merge "Add support for USB accessory serial numbers" into honeycomb-mr1
...
* commit '0958fb1068ee1b5e6c40eee16d943a664b1124b4':
Add support for USB accessory serial numbers
2011-03-14 17:47:49 -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
ac1aa45ed9
am 373ece1f: 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 '373ece1fa158d72152712b36674a9c114a40b649':
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 16:36:50 -07: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
da9b9b248a
am 21f86159: am b6866f81: am 0fd8fa33: Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1
...
* commit '21f86159ffa78dd4bd7fec2053dc2413f0cc7288':
Adding placeholders for the fullscreen button used by the browser for HTML5 video
2011-03-14 15:27:25 -07:00
Huahui Wu
a492e1a14b
am ddba200b: am 9691d3f3: am b71020ef: Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1
...
* commit 'ddba200b425c56b3b66ead23e8d5fd51a17c6cc4':
b/3392594 keep the remain touch points when one is ended.
2011-03-14 15:22:12 -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
Scott Main
a51a6beeed
am 9e173ece: am 2213a4ac: am 462012db: am abdf0d53: docs: update search dev guide with SearcView widget
...
* commit '9e173ececf985c1dcd32e3cc2627499919fc329b':
docs: update search dev guide with SearcView widget
2011-03-14 15:19:21 -07:00
Eric Fischer
2d59a94716
am 29f10747: am 9f70f526: Merge "Add "new incognito window" translations." into honeycomb-mr1
...
* commit '29f107476d577e073748c29a9e31c573620684be':
Add "new incognito window" translations.
2011-03-14 15:18:52 -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
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
2213a4aca0
am 462012db: am abdf0d53: docs: update search dev guide with SearcView widget
...
* commit '462012db70fb73431bb25909d73e45fea9fc5911':
docs: update search dev guide with SearcView widget
2011-03-14 14:42:51 -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
Eric Fischer
9f7b4ba69c
Import revised translations. DO NOT MERGE
...
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
2011-03-14 14:31:58 -07:00
Eric Fischer
aa3ea7be0c
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:31:42 -07:00
Eric Fischer
29f107476d
am 9f70f526: Merge "Add "new incognito window" translations." into honeycomb-mr1
...
* commit '9f70f5268fac9c2dd5ed4cb9582da5931c846a91':
Add "new incognito window" translations.
2011-03-14 14:28:58 -07:00
Michael Jurka
e3f075622d
Merge "Removing TextView predraw listeners sooner"
2011-03-14 14:23:47 -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
Michael Jurka
2b942d5329
Removing TextView predraw listeners sooner
...
Solves issue where the listeners were being run on every frame
2011-03-14 13:31:03 -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
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
Gilles Debunne
3c03047bd4
am f2f3627f: am 8503af84: Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1
...
* commit 'f2f3627f658931e9e8162cc6d066e4cccd81bd10':
Paste popup uses a disabled icon when there is nothing to paste.
2011-03-14 12:06:59 -07:00
Nick Pelly
d1c49d681c
am a64e2ad4: resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp
...
* commit 'a64e2ad4da3612586594a19489a2b5d44f3f23a0':
Implement new NFC-EE API's as shared library (frameworks/base).
2011-03-14 12:04:51 -07:00
Gilles Debunne
e1fb6ebd13
Merge "Removed empty block warnings in TextView"
2011-03-14 11:28:31 -07:00