Teng-Hui Zhu
2c6f2816d7
am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1
...
* commit '5039e6da1e74c0a0c10772f585ea4e5e6bcf0a16':
fix for pause when loading
2011-03-22 13:56:35 -07:00
Teng-Hui Zhu
158fbdb29b
fix for pause when loading
...
bug:4148903
Change-Id: Ib0b59c8c36eb5df8c6755156a5d2753f84ad9677
2011-03-22 12:02:11 -07:00
Teng-Hui Zhu
f2c44a79d9
am 039aa81a: Merge "Fix a crash" into honeycomb-mr1
...
* commit '039aa81a67465f189c24f92567ccb08ed8a5dce2':
Fix a crash
2011-03-21 18:13:21 -07:00
Teng-Hui Zhu
cd44562455
Fix a crash
...
bug:4139931
Change-Id: Ifc18f964d5aedb268eb0d5fa08db3ffed1de4ff8
2011-03-21 17:38:21 -07:00
Teng-Hui Zhu
f82e5a2c90
am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1
...
* commit '0b933c02dddbc325498b3b73d8be9167b155801b':
Support loading image and paused image for inline video
2011-03-21 14:19:29 -07:00
Teng-Hui Zhu
265db32f31
Support loading image and paused image for inline video
...
bug:4142131
Change-Id: I28d82a8e30a2146a3380c63dcdcbd51228f23f56
2011-03-21 10:36:00 -07:00
Derek Sollenberger
25dad8eda1
am 5750bb7d: Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1
...
* commit '5750bb7d8f59c0f8e18baaa60bcb492c867db590':
Prevent intermediate scale updates from being sent to WebKit while zooming.
2011-03-18 11:02:45 -07:00
Derek Sollenberger
a249a93e8d
Prevent intermediate scale updates from being sent to WebKit while zooming.
...
The addition of the HW accelerated logic causes us to manipulate the
zoom scale factor in the zoom manager two additional times. These
manipulations occur after the mZoomScale has been set to zero is how we
previously tested to see if a fixed length animation was occuring.
bug: 3451126
Change-Id: If2992adbe36fa471bb1bb5013495e1adc74b5fab
2011-03-18 12:48:36 -04:00
Dianne Hackborn
efb56934ef
am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
...
* commit '1d50ad7914de36b63a04d39bdc4791c1dadc7eae':
Whoops, forgot the HONEYCOMB_MR1 constant. :(
2011-03-17 19:02:15 -07:00
Dianne Hackborn
1d50ad7914
Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
2011-03-17 19:00:56 -07:00
Dianne Hackborn
edf1fc6ce6
Whoops, forgot the HONEYCOMB_MR1 constant. :(
...
It shouldn't be a problem to put this in -- it is a static final
so it doesn't actually need to be in the on-device system image.
This is important for the SDK.
Change-Id: Iaa086247d0d65fe708c40fbab506aa60cd3e1396
2011-03-17 18:34:48 -07:00
Huahui Wu
d1e89c412f
am b1c43c32: Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1
...
* commit 'b1c43c32f518240fd75963ffc8e82cb13e036390':
b/4116658 Fix the jumpy scrolling with some flash site.
2011-03-17 18:11:04 -07:00
Huahui Wu
b1c43c32f5
Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1
2011-03-17 18:09:33 -07:00
Huahui Wu
88b869a40a
b/4116658 Fix the jumpy scrolling with some flash site.
...
In the case that a touch event is passed to WebKit then back to
WebView, the coordinates will be converted from view to content
then back to view and the convertion could lose some accuracies.
For a flash content that only consumes TouchDown, all the
TouchMove events will go through this path and each time, the
data becomes more inaccurate. Even worse, the TouchMove event
updates the mScrollX/Y which will then be used for the convertion.
The effect amplifies really quick and the scrolling looks jumpy.
The fix is just to store the original view coordinates when pass
the event around.
Change-Id: Ie1424d7cfc6272348b194732e97168efe2dcf17b
2011-03-17 17:42:12 -07:00
Teng-Hui Zhu
0318d6bfd3
am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1
...
* commit '73091273bb5160567f2230e1e7fcde5b0218ad9d':
Fix the aspect ratio for full screen playing
2011-03-17 14:22:26 -07:00
Teng-Hui Zhu
1ab0df7f5a
Fix the aspect ratio for full screen playing
...
bug:4116475
Change-Id: I0b04ef4a6db24a9bc5c8d0f0a987783695bc3489
2011-03-17 13:36:33 -07:00
Adam Powell
ea775ca3ac
am f8d1533b: Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1
...
* commit 'f8d1533b07b51935e295b2cf92e2ea2aa94b303f':
Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow
2011-03-17 01:38:15 -07:00
Adam Powell
d0197f3669
Fix bug 4111271 and bug 4077526 - WebView touch event handling when
...
WebCore is too slow
Make sure that we can recover properly from a bad gesture with missing
events that never come back from webcore. Lower timeout to 1 second.
Confirm movement on touch event enqueue so that we don't get phantom
taps or long presses when webcore is slow to respond.
Add sanity check in ScaleGestureDetector to end a gesture early on a
bad MotionEvent stream rather than throwing up.
Change-Id: I69690409d7edd6b4320dbcf3b052aba4023360fe
2011-03-17 01:32:17 -07:00
Teng-Hui Zhu
7a0949c60d
am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1
...
* commit '7af7e00b9112f15d1683ae93975a6fcd9dd34da8':
Support html5 video switching b/t full screen and inline mode
2011-03-16 23:03:04 -07:00
Teng-Hui Zhu
7af7e00b91
Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1
2011-03-16 23:01:03 -07:00
Teng-Hui Zhu
10ab654943
Support html5 video switching b/t full screen and inline mode
...
bug:2126902
Change-Id: I5c4b25358c76e35f0f51794d6d04fcc5098a0d70
2011-03-16 22:06:28 -07:00
Bart Sears
247820c0a7
am 8e42d39f: Merge "partial inval" into honeycomb-mr1
...
* commit '8e42d39f0b1c2a60ab9c2f88cd3835ef8ae690ed':
partial inval
2011-03-16 21:50:52 -07:00
Nicolas Roard
f2674c1a2c
partial inval
...
Change-Id: Ib8ba0fdbbbcae3061692043d33fecb8ffa8ee100
2011-03-16 16:05:19 -07:00
Shimeng (Simon) Wang
f2532d16a4
am 464b690a: Pass firstLayout info to native webview when setting baseLayer.
...
* commit '464b690ada24428f3dff4102659048db7128835f':
Pass firstLayout info to native webview when setting baseLayer.
2011-03-16 14:47:32 -07:00
Shimeng (Simon) Wang
464b690ada
Pass firstLayout info to native webview when setting baseLayer.
...
issue: 4094300
Change-Id: I4fdbc0cee73230a731b1356f44372cd86a5c4ad1
2011-03-16 13:56:37 -07:00
Michael Kolb
b0a07f0ce5
am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1
...
* commit '6bb2020e6e9914f6df3dc7d69dbd21782267fbd4':
add comment to deprecated tag
2011-03-16 13:34:30 -07:00
Michael Kolb
24e53b00b0
add comment to deprecated tag
...
Change-Id: Id0c30c43abfeb9005f9b69e0a565644c7c956295
2011-03-16 12:56:39 -07:00
Michael Kolb
9a0df3c5c7
am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
...
* commit '95fd065e3cef0bef723a2e624191b08bb00ce6f8':
deprecate getVisibleTitleHeight
2011-03-16 11:35:45 -07:00
Michael Kolb
e54f66524e
deprecate getVisibleTitleHeight
...
Bug: 4104535
Change-Id: I8a6ef21d38a25848efa28e2c06cf2da0ff7af9c4
2011-03-16 09:25:23 -07:00
Svetoslav Ganov
3b901c4b89
am bdabdda8: Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1
...
* commit 'bdabdda8954a70625368fbfe6bb283a9200bf2f8':
CheckBoxPreferences do not fire accessibility events
2011-03-15 13:42:38 -07:00
Svetoslav Ganov
1686e9afd4
CheckBoxPreferences do not fire accessibility events
...
bug:4091160
We no longer allow not shown views to fire accessibility
events. Therefore, CheckBoxPreference can no longer ask its
associated checkbox to fire an accessibility event because
the latter is not attached to the view hierarchy
(i.e. not shown) by the time the CheckBoxPreference has a
chance to send an accessibility event. Instead the
CheckBoxPreference itself is responsible for firing the event.
Change-Id: Ia742882b13bf6c441cc76fa1e84b47a55cee601c
2011-03-15 12:30:20 -07:00
Brad Fitzpatrick
aaae0573bb
am 403da3a7: am 8d25eab1: Merge "Releasing lock even if exception is thrown."
...
* commit '403da3a79af78920b33448bbc8d91c4b8aebf4a4':
Releasing lock even if exception is thrown.
2011-03-15 12:05:40 -07:00
Brad Fitzpatrick
b8796212e3
resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp
...
Change-Id: Ic677e58dcc182908ae1fde33047b3fda013a37c3
2011-03-15 11:54:46 -07:00
Brad Fitzpatrick
403da3a79a
am 8d25eab1: Merge "Releasing lock even if exception is thrown."
...
* commit '8d25eab10523ac2424dc645dc697126dbadad588':
Releasing lock even if exception is thrown.
2011-03-15 11:37:37 -07:00
Brad Fitzpatrick
b01fc9fb45
am 8b5345fb: Merge "Fixing self-assignment in copying code."
...
* commit '8b5345fb3647fee0ec5882537b6a68bb90f4ac1b':
Fixing self-assignment in copying code.
2011-03-15 11:37:25 -07:00
Brad Fitzpatrick
ceae99835e
am 9a01a2f2: Merge "Fixing self-assignment in cloning code."
...
* commit '9a01a2f2720632aa9cc230a4ebb0ed7aee762eec':
Fixing self-assignment in cloning code.
2011-03-15 11:33:40 -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
8d25eab105
Merge "Releasing lock even if exception is thrown."
2011-03-15 11:23:44 -07:00
Brad Fitzpatrick
8b5345fb36
Merge "Fixing self-assignment in copying code."
2011-03-15 11:18:18 -07:00
Brad Fitzpatrick
9a01a2f272
Merge "Fixing self-assignment in cloning code."
2011-03-15 11:15:19 -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
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
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
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