Brad Fitzpatrick
7fa77d8b23
am b81d7f83: am 33dd1bae: am 29d75c9a: Merge "Fixing improper boxing to Integer instead of Long."
...
* commit 'b81d7f833890498b6d5db9c16f32564cc88a4042':
Fixing improper boxing to Integer instead of Long.
2011-03-15 11:44:43 -07:00
Brad Fitzpatrick
b81d7f8338
am 33dd1bae: am 29d75c9a: Merge "Fixing improper boxing to Integer instead of Long."
...
* commit '33dd1bae6ef16ed1cdc4d9f82f0c608cc7601af6':
Fixing improper boxing to Integer instead of Long.
2011-03-15 11:42:58 -07:00
Brad Fitzpatrick
33dd1bae6e
am 29d75c9a: Merge "Fixing improper boxing to Integer instead of Long."
...
* commit '29d75c9a10a1ff6d60e85a1931d042d3e24d9549':
Fixing improper boxing to Integer instead of Long.
2011-03-15 11:30:08 -07:00
Brad Fitzpatrick
cd7dfcec4b
am 40b207c1: Merge "Using proper key for removing object from the map."
...
* commit '40b207c131e224554e30cde30fe4ee49817432ee':
Using proper key for removing object from the map.
2011-03-15 11:30:04 -07:00
Brad Fitzpatrick
c73c4a36d2
am b37f7e59: Merge changes I81fc2f90,I5e7fd759
...
* commit 'b37f7e59ee38472bdd3ca5fe66cc847890c862e2':
Using proper key for removing from map.
Removing wrong equals method in comparator.
2011-03-15 11:29:56 -07:00
Brad Fitzpatrick
29d75c9a10
Merge "Fixing improper boxing to Integer instead of Long."
2011-03-15 11:03:29 -07:00
Brad Fitzpatrick
40b207c131
Merge "Using proper key for removing object from the map."
2011-03-15 11:00:51 -07:00
Brad Fitzpatrick
b37f7e59ee
Merge changes I81fc2f90,I5e7fd759
...
* changes:
Using proper key for removing from map.
Removing wrong equals method in comparator.
2011-03-15 10:56:16 -07:00
Svetoslav Ganov
9406eb13d5
am 6d4f318f: am e65711b2: Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1
...
* commit '6d4f318f0c836c0c2eac3a1d99debedc6c03578a':
Tapping on the week number sends the DatePicker to epoch start.
2011-03-14 23:17:58 -07:00
Svetoslav Ganov
6d4f318f0c
am e65711b2: Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1
...
* commit 'e65711b21f1b351f28d4f04819e1e05a9ac8dfee':
Tapping on the week number sends the DatePicker to epoch start.
2011-03-14 23:15:24 -07:00
Svetoslav Ganov
e65711b21f
Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1
2011-03-14 23:13:49 -07:00
Adam Powell
75a1ef8d14
am 15c9ab33: am 57fccf12: Merge "Fix bug 4099023 - Phantom clicks on some websites" into honeycomb-mr1
...
* commit '15c9ab336eff66cafa365e9ea3a81f9f1b5c2635':
Fix bug 4099023 - Phantom clicks on some websites
2011-03-14 18:37:18 -07:00
Svetoslav Ganov
1a730dcc4f
Tapping on the week number sends the DatePicker to epoch start.
...
bug:4093343
1. If getting a day from location in a week view fails
the out date was cleared but the client was unaware
of that failure. I have added a return value indicating
where getting the day from locations was successfull.
Change-Id: I566a9ee33dfe2e64300a4b50dacc652114e01442
2011-03-14 18:34:55 -07:00
Adam Powell
15c9ab336e
am 57fccf12: Merge "Fix bug 4099023 - Phantom clicks on some websites" into honeycomb-mr1
...
* commit '57fccf12e1e71089aa01cbf9867314f82db4e6f9':
Fix bug 4099023 - Phantom clicks on some websites
2011-03-14 18:33:56 -07:00
Adam Powell
57fccf12e1
Merge "Fix bug 4099023 - Phantom clicks on some websites" into honeycomb-mr1
2011-03-14 18:32:45 -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
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
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
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
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
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
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
Scott Main
c899d32e8b
docs: update search dev guide with SearcView widget
...
Change-Id: Ieb0ccdb78760a3c90df2381e647463f7532b0efc
2011-03-14 14:44:41 -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
Michael Jurka
e3f075622d
Merge "Removing TextView predraw listeners sooner"
2011-03-14 14:23:47 -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
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
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
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
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
e1fb6ebd13
Merge "Removed empty block warnings in TextView"
2011-03-14 11:28:31 -07:00
Gilles Debunne
2b63ffc536
Merge "Wrong null check in TextView"
2011-03-14 11:28:20 -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
0c5820ad8e
am 151c74b3: am e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1
...
* commit '151c74b3c679a1799d01f210a2a3f4a658154320':
Add a dialog to ask user to start an application for a USB device or accessory
2011-03-14 07:10:07 -07:00