Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,524 Commits 3 Branches 0 Tags
aedc2a8fcc2841063b3324e09234eff03044a324
Commit Graph

1708 Commits

Author SHA1 Message Date
Brad Fitzpatrick
d117428bf9 am 5db7fd6b: am f7a9b869: am 1e7fb7ae: Merge "Error in compound cache-control header." 
* commit '5db7fd6b70f47f31fbc59f92907b9807f9c4e64d':
  Error in compound cache-control header.
 2011-03-30 16:38:18 -07:00
Teng-Hui Zhu
f4d4e9e05f Buffering in full screen mode will show progressView 
bug:4187252
Change-Id: Ieb7ae26b5bfa9abc79556e2fc063b7e3ef17ab52
 2011-03-30 16:05:27 -07:00
Brad Fitzpatrick
5db7fd6b70 am f7a9b869: am 1e7fb7ae: Merge "Error in compound cache-control header." 
* commit 'f7a9b8691918642db74a667a71028c0a77b527ff':
  Error in compound cache-control header.
 2011-03-30 08:21:23 -07:00
Teng-Hui Zhu
c0fccd1292 Add the loading progress UI when buffering 
bug:4187252
Change-Id: I0f9f2c659303b391b1be896b9a30cc6bf7455da5
 2011-03-29 15:07:35 -07:00
Brad Fitzpatrick
f7a9b86919 am 1e7fb7ae: Merge "Error in compound cache-control header." 
* commit '1e7fb7aed7b00cebc8f0e501c911727af6527523':
  Error in compound cache-control header.
 2011-03-29 09:27:16 -07:00
Henrik Baard
eb0ced7a09 Error in compound cache-control header. 
A cache control header containing both no-cache and max-age attribute does not
behave as expected.

Cache-Control: no-cache, max-age=200000

Will set expired to 20000ms seconds, ignoring the no-cache header. My
interpretation is that the no-cache header should not be ignored in
this case.

Change-Id: Iadd1900e4d2c6c0dacc6bb3e7b944cf78ca9b266
 2011-03-29 08:54:09 +02:00
Adam Powell
1453f0926f am 7dfc6a9e: am c8c78eed: am baa3380d: Fix bug 4170809 - Pages with flash lose touch events 
* commit '7dfc6a9e322e9c0367a6372b25694d926d79a618':
  Fix bug 4170809 - Pages with flash lose touch events
 2011-03-25 14:54:10 -07:00
Adam Powell
baa3380d74 Fix bug 4170809 - Pages with flash lose touch events 
Fix WebView touch cancel behavior when we time out waiting for a
response from webkit.

Change-Id: I0aeeea64b156e204dbe2dda913a42df28704ed16
 2011-03-25 13:58:19 -07:00
Huahui Wu
772f5bb189 am f440831d: DO NOT MERGE 
* commit 'f440831d76817e837164ca18c7705e81d2391f87':
  DO NOT MERGE
 2011-03-24 03:35:59 -07:00
Teng-Hui Zhu
d9f68bc9e0 am 842b914f: am a7605d3b: am 2d09b855: Merge "When the video is not on the front, it should be paused" into honeycomb-mr1 
* commit '842b914f26633aa94f3c63fbfc6a6b521904e1b8':
  When the video is not on the front, it should be paused
 2011-03-23 17:38:28 -07:00
Teng-Hui Zhu
1e26d82ffa When the video is not on the front, it should be paused 
bug:4165855
Change-Id: Icbdab81fe5beb8642841b16773b0e5350b4221cf
 2011-03-23 16:56:12 -07:00
Teng-Hui Zhu
d6f8f798f2 am fee1d146: am 50373509: am efb8eda4: Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1 
* commit 'fee1d146a3285e887712150496bbf002f4945079':
  Make sure the full screen playing continue when timeout
 2011-03-23 16:09:46 -07:00
Teng-Hui Zhu
efb8eda41a Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1 2011-03-23 16:03:04 -07:00
Teng-Hui Zhu
2deec6651c Make sure the full screen playing continue when timeout 
bug:4165804
Change-Id: I5e0f4bdaecce36d074941ae6631b211227c13fcb
 2011-03-23 15:29:22 -07:00
Huahui Wu
f440831d76 DO NOT MERGE 
b/4088884 Backport "Remove content:// protocol handler in web browser"
to Gingerbread

It's a manual cherrypick of
     https://android-git.corp.google.com/g/#change,87278
since a lot has been changed in bettween.

Change-Id: Ic8e3a419571f535bf983f32cd02181ca66d19319
 2011-03-23 09:41:09 -07:00
Teng-Hui Zhu
8d2b7f350b am 6e5276cf: am 2c6f2816: am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1 
* commit '6e5276cf001112f93b3ca811d220331cc74cd8df':
  fix for pause when loading
 2011-03-22 14:00:20 -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
fdef2cb760 am c81d7e0a: am f2c44a79: am 039aa81a: Merge "Fix a crash" into honeycomb-mr1 
* commit 'c81d7e0ae802626e9e7a09bdc70afe4952c2ac96':
  Fix a crash
 2011-03-22 11:42:37 -07:00
Teng-Hui Zhu
217c6c7fbe am 67440893: am f82e5a2c: am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1 
* commit '67440893ee32f057d2695b0eea9811e289b68603':
  Support loading image and paused image for inline video
 2011-03-21 17:48:59 -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
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
e4af0ed6b3 am 0c8e22b1: am 25dad8ed: am 5750bb7d: Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1 
* commit '0c8e22b1d3dbcd4580db2a288af65fcca10cde1b':
  Prevent intermediate scale updates from being sent to WebKit while zooming.
 2011-03-18 11:27:12 -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
Huahui Wu
45a746a107 am f5cf85d0: am d1e89c41: am b1c43c32: Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1 
* commit 'f5cf85d07c99ae834d1b58bf5109982f9a4f3604':
  b/4116658 Fix the jumpy scrolling with some flash site.
 2011-03-17 18:47:21 -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
e92f2121a7 am 6b3c25c8: am 0318d6bf: am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 
* commit '6b3c25c859ef72e7f65527c6aae68e77df580b94':
  Fix the aspect ratio for full screen playing
 2011-03-17 14:25:47 -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
7270f62c1f am 9cd93f09: am ea775ca3: am f8d1533b: Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1 
* commit '9cd93f09d451afacb8fffeee5e71806e0f91cf31':
  Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow
 2011-03-17 01:41:30 -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
607a10c5c9 am a13640b9: am 7a0949c6: am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1 
* commit 'a13640b9efe1706ad0b6b608ccfca800166d7c01':
  Support html5 video switching b/t full screen and inline mode
 2011-03-16 23:08:20 -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
16c4f35692 am 2983bb6a: am 247820c0: am 8e42d39f: Merge "partial inval" into honeycomb-mr1 
* commit '2983bb6a363010403668d39fdc42f5712bff5eb3':
  partial inval
 2011-03-16 21:54:38 -07:00
Nicolas Roard
f2674c1a2c partial inval 
Change-Id: Ib8ba0fdbbbcae3061692043d33fecb8ffa8ee100
 2011-03-16 16:05:19 -07:00
Shimeng (Simon) Wang
0ec5c78a80 am 0c4f09be: am f2532d16: am 464b690a: Pass firstLayout info to native webview when setting baseLayer. 
* commit '0c4f09be5b73bd6bf19921d907fadc50d853deaf':
  Pass firstLayout info to native webview when setting baseLayer.
 2011-03-16 14:51:21 -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
dce574a191 am 5b7a1bd7: am b0a07f0c: am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1 
* commit '5b7a1bd7906b24e92d61b967abe736cc3559bf08':
  add comment to deprecated tag
 2011-03-16 13:43:30 -07:00
Michael Kolb
24e53b00b0 add comment to deprecated tag 
Change-Id: Id0c30c43abfeb9005f9b69e0a565644c7c956295
 2011-03-16 12:56:39 -07:00
Michael Kolb
0677d2526d am d799caa9: am 9a0df3c5: am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 
* commit 'd799caa9a6623de4af581bebc9759272c10b6588':
  deprecate getVisibleTitleHeight
 2011-03-16 12:35:42 -07:00
Michael Kolb
e54f66524e deprecate getVisibleTitleHeight 
Bug: 4104535

Change-Id: I8a6ef21d38a25848efa28e2c06cf2da0ff7af9c4
 2011-03-16 09:25:23 -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
Adam Powell
57fccf12e1 Merge "Fix bug 4099023 - Phantom clicks on some websites" into honeycomb-mr1 2011-03-14 18:32:45 -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
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
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
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
Adam Powell
e5c1bdfa98 am f7db87f0: am 87584f51: Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1 
* commit 'f7db87f0730ce91e3230b798b3a85bb47f655ba8':
  Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances
 2011-03-11 16:44:09 -08:00
Adam Powell
87584f51a8 Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1 2011-03-11 16:39:42 -08:00
Nicolas Roard
9a3595c2c8 am c6c311f7: am f0230cca: Merge "HTML5 Video improvements" into honeycomb-mr1 
* commit 'c6c311f77459c3852d4a8c887657f6a135ad4cdf':
  HTML5 Video improvements
 2011-03-11 15:18:46 -08:00