Derek Sollenberger
0c8e22b1d3
am 25dad8ed: am 5750bb7d: Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1
...
* commit '25dad8eda13d70a2473cde735042d083a578fb48':
Prevent intermediate scale updates from being sent to WebKit while zooming.
2011-03-18 11:23:51 -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
Valentin Kravtsov
d35f939010
am 000466d7: am 125be9c8: Merge "Fixing a race condition in RecognitionService" into gingerbread
...
* commit '000466d79d33fa302c6c8d20d2db45faca7c31e0':
Fixing a race condition in RecognitionService
2011-03-18 09:15:49 -07:00
Valentin Kravtsov
000466d79d
am 125be9c8: Merge "Fixing a race condition in RecognitionService" into gingerbread
...
* commit '125be9c85a3bf71add2841d4195905c1e681a83e':
Fixing a race condition in RecognitionService
2011-03-18 09:04:33 -07:00
Valentin Kravtsov
125be9c85a
Merge "Fixing a race condition in RecognitionService" into gingerbread
2011-03-18 08:49:51 -07:00
Dianne Hackborn
daa71254f3
am efb56934: am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
...
* commit 'efb56934efdc0aae38ce7264f2576326293846b6':
Whoops, forgot the HONEYCOMB_MR1 constant. :(
2011-03-17 19:05:08 -07: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
f5cf85d07c
am d1e89c41: am b1c43c32: Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1
...
* commit 'd1e89c412ff10345cd217ae3d1bb1e780d56dbaa':
b/4116658 Fix the jumpy scrolling with some flash site.
2011-03-17 18:13:16 -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
6b3c25c859
am 0318d6bf: am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1
...
* commit '0318d6bfd3882b3f6fb82b03aca496e68c36d1f9':
Fix the aspect ratio for full screen playing
2011-03-17 14:23:38 -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
Brad Fitzpatrick
8698c91204
am b8332786: am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code."
...
* commit 'b8332786e3ac6d58504a7c3128e94e63255b3515':
Removing dead store; it was likely a relict of debuging code.
2011-03-17 10:36:47 -07:00
Brad Fitzpatrick
b8332786e3
am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code."
...
* commit 'd973bed36cb4d4da1d97f309119f4114f60e7171':
Removing dead store; it was likely a relict of debuging code.
2011-03-17 10:18:15 -07:00
Adam Powell
9cd93f09d4
am ea775ca3: am f8d1533b: Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1
...
* commit 'ea775ca3ac793033e91b4d1cc05dfdb53ab807be':
Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow
2011-03-17 01:39:44 -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
Jozef BABJAK
f1aa297b17
Removing dead store; it was likely a relict of debuging code.
...
Change-Id: I4daab1359d7c4b300ef61e3de1578d9fecb6f8da
2011-03-17 09:23:32 +01:00
Teng-Hui Zhu
a13640b9ef
am 7a0949c6: am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1
...
* commit '7a0949c60df2085fc38eea71d78f9c17eb26cd65':
Support html5 video switching b/t full screen and inline mode
2011-03-16 23:05:41 -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
2983bb6a36
am 247820c0: am 8e42d39f: Merge "partial inval" into honeycomb-mr1
...
* commit '247820c0a756413986643a0ed9a8d446afc747ee':
partial inval
2011-03-16 21:52:23 -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
0c4f09be5b
am f2532d16: am 464b690a: Pass firstLayout info to native webview when setting baseLayer.
...
* commit 'f2532d16a4a2ca4dffe9bf9568fdd24475369cac':
Pass firstLayout info to native webview when setting baseLayer.
2011-03-16 14:49:18 -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
5b7a1bd790
am b0a07f0c: am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1
...
* commit 'b0a07f0ce54ee812f9a00cc53f43919051d563c3':
add comment to deprecated tag
2011-03-16 13:38:24 -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
d799caa9a6
am 9a0df3c5: am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
...
* commit '9a0df3c5c730ff12e050945f2bad0d86a37c5b2f':
deprecate getVisibleTitleHeight
2011-03-16 11:37:23 -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
Dianne Hackborn
9b7c1274dd
am e2e8da7c: am 7c2e76f0: Merge "Improve error reporting for issue #3183612 " into gingerbread
...
* commit 'e2e8da7c734b71c4b6b81e51e16ce3f4061f0f07':
Improve error reporting for issue #3183612
2011-03-15 15:44:18 -07:00
Dianne Hackborn
e2e8da7c73
am 7c2e76f0: Merge "Improve error reporting for issue #3183612 " into gingerbread
...
* commit '7c2e76f0a4daa7e4316e7a85d41d3c391319d955':
Improve error reporting for issue #3183612
2011-03-15 14:49:45 -07:00
Mike Lockwood
3c9aa1aa09
am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread
...
* commit 'b09763209980ff9210cc353f2410598220ec0480':
DO NOT MERGE: Backport more USB accessory changes from honeycomb
2011-03-15 14:49:37 -07:00
Dianne Hackborn
7c2e76f0a4
Merge "Improve error reporting for issue #3183612 " into gingerbread
2011-03-15 14:40:56 -07:00
Dianne Hackborn
1ab43775d8
Improve error reporting for issue #3183612
...
java.lang.SecurityException: Neither user 1209 nor current process
has android.permission.WAKE_LOCK.
Change-Id: I465972ab91b007e04b2ac62550f78583956a4048
2011-03-15 14:38:02 -07:00
Mike Lockwood
638d7cb3ee
DO NOT MERGE: Backport more USB accessory changes from honeycomb
...
Change-Id: I8459c5ab9fbf0b3cad752041484a5de44ca9badd
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-15 16:50:18 -04: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
bdabdda895
Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1
2011-03-15 13:23:17 -07:00
Adam Powell
fbe9ca7262
am 1d233d97: Merge "Fix bug 4088936 - Tabs in the action bar don\'t seem to have a fading edge" into honeycomb-mr1
...
* commit '1d233d9708e39f5b57b231746df658567b153484':
Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge
2011-03-15 12:51:07 -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