Commit Graph

2094 Commits

Author SHA1 Message Date
Kristian Monsen
7859c1842c Merge "Improving PictureListener deprecating comments" into ics-mr1 2011-11-20 07:26:59 -08:00
Bart Sears
e6a96560ed Merge "Content and viewport rects set in one step." into ics-mr1 2011-11-18 11:46:26 -08:00
Kristian Monsen
4aad1022eb Improving PictureListener deprecating comments
Change-Id: If189823962c49db9681845996e97eec31fedcca6
2011-11-18 17:09:12 +00:00
Michael Kolb
852585c034 Merge "Draw input field focus ring in WebTextView" into ics-mr1 2011-11-17 12:22:58 -08:00
Michael Kolb
edb39ce5b4 Draw input field focus ring in WebTextView
Bug: 5628053

Change-Id: I1a3d5402e7925e71877be2c278e95f25e75746f3
2011-11-17 11:08:59 -08:00
John Reck
775e986ece Merge "Fix add single character check" into ics-mr1 2011-11-17 08:48:04 -08:00
John Reck
1da3d65635 Merge "Undeprecate LayoutAlgorithm" into ics-mr1 2011-11-17 08:47:29 -08:00
George Mount
82ed95f410 Content and viewport rects set in one step.
Bug 5342918
 The content rect of the WebView was being retrieved during
 the draw while the viewport rect was being set when the
 draw functor was setup. During animations, the content
 rect was changing between the time the draw functor was
 retrieved and it was executed. The content rect is now
 being set with the viewport rect.

 Wekbkit Change: I05d68dcc

Change-Id: I1b0978eeb27d9f1deddfeba3ede869f735f74394
2011-11-17 08:31:55 -08:00
Ben Murdoch
fead0e14b4 Merge changes I59323dc5,I31a01aa3 into ics-mr1
* changes:
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.
2011-11-17 02:13:19 -08:00
Nicolas Roard
e88ca718ed Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1 2011-11-16 19:40:04 -08:00
Nicolas Roard
2bc0b01ffe Hack to workaround the fact that the EGL context can be
removed from under us by framework in low memory condition.

bug:5627977
Change-Id: I3c138985e3e6c16f7c15497a1a11ffed93cd8e78
2011-11-16 19:31:00 -08:00
Mangesh Ghiware
4fdfdeedc6 Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 2011-11-16 18:01:35 -08:00
John Reck
f9a6c91f75 Fix add single character check
Bug: 5618801

Change-Id: I42a19855b188c9175b8f7a293faa96027685052c
2011-11-16 16:58:56 -08:00
Mangesh Ghiware
e832b63c97 Revert change to setInitialScale() to take display density into account.
Updated WebView documentation to clarify this behavior.

Additionally, if target-densityDpi is specified in the meta viewport
tag, update the display density in ZoomManager.

Bug: 5477652
Bug: 5327492
Change-Id: I176e87489f76a2ee6595d76a006e302b07595de1
2011-11-16 13:31:56 -08:00
Ben Murdoch
cd0dd93d13 WebViewDatabase v11 for ICS.
Bump WebView database version to 11. This has the following effects:

- Removes the old webview cookie table on GB devices. Cookies are now
  managed by the Chromium stack.
- Removes the old webview cache database on GB devices. Cache is now
  managed by the Chromium stack.
- Autocomplete form data is now stored/retrieved based on
  the URL minus the query string/fragment. Upgrade any existing
  form URLs in the database to match this format, so we can
  still use them. This will impact GB and HC devices.

  This has an unfortunate side effect that we may end up with
  duplicate URLs in the formurl table (say we had two URLS for the
  same host but with different query strings). Currently we only take
  the first url from the table - which is fine when they were
  unique. The simplest way to work around this is just iterate all the
  rows returned and use all the values we find.

Bug: 5560410
Change-Id: I59323dc5e523969e0a1c268b5936d6fa998d625c
2011-11-16 19:33:21 +00:00
John Reck
5a1ef4132f Undeprecate LayoutAlgorithm
Bug: 5533078
 There is no alternative and this is still useful and used. It should
 not have been deprecated.

Change-Id: I641026cf76ea87738909827b7c48a556d9021d11
2011-11-16 11:08:44 -08:00
Ben Murdoch
f10daf6470 Fix a bug in the database upgrade process, and refactor slightly.
During upgrade from v9 -> v10 the database version was not
being updated.

Also remove conditionals based on what are effectively hardcoded
truth values to simplfiy the logic greatly.

Bug: 5560410
Change-Id: I31a01aa35a109a951d4e4c6d5b884bb666668b28
2011-11-16 18:47:59 +00:00
John Reck
83b9e1d99d Call onScrollChanged when scrolling layers
Bug: 5533389
 Treat layer scrolling as a no-op scroll by calling
 onScrollChanged with old scroll == new scroll

Change-Id: I1dc2b94b37c65bf088806b8d28be32883e3b8bee
2011-11-14 16:17:54 -08:00
John Reck
9f9fac0ad2 Fix lastVisible/global rects
Bug: 5601629
 References tend to always be equal to the things they are referencing,
 use copies instead.

Change-Id: I0827878e91ef1fa6e0abe2d6499d55f4a211d890
2011-11-10 17:33:24 -08:00
John Reck
843e04d977 Merge "Pause drawing when not visible" into ics-mr1 2011-11-10 09:19:55 -08:00
George Mount
c60baec7a7 Merge "DO NOT MERGE Set the initial scroll position for RTL." into ics-mr1 2011-11-10 08:32:18 -08:00
John Reck
5f1c549132 Pause drawing when not visible
Bug: 5594608
 If onPause is called or if the view or view's window is no longer
 visible, pause webview drawing. Calls to onDraw will continue to work,
 but animations and other continual drawing will stop

Change-Id: I11640f087852d1a9a33b945ff72297fab1d25b94
2011-11-09 17:19:43 -08:00
George Mount
331493085d DO NOT MERGE Set the initial scroll position for RTL.
Bug 5268793
 Webkit knows about the correct initial position for web pages.
 On initial show, scroll to the webkit position.

 Cherry-picked from master CL: I2537b84a

 External WebKit CL: I6a91b97f

Change-Id: I2537b84a30a26a79a8a0f23fe62b9ed757f9c5a4
2011-11-09 15:37:26 -08:00
John Reck
36a7f2a9ad Merge "Fix determining find on page overlap" into ics-mr1 2011-11-09 09:28:11 -08:00
John Reck
d6ac727234 Fix determining find on page overlap
Bug: 5572138

Change-Id: Ie528e1cf9df363307018e01a898e8d9dfff1cd45
2011-11-08 15:00:17 -08:00
Michael Kolb
39036ace76 Remove flicker from WebTextView
Bug: 5522186

   Update LayoutParams when position changed only

Change-Id: I54beb489c261090d7ba258354449501b771fd98e
2011-11-08 14:21:06 -08:00
John Reck
aefc28a1b6 Remove unnecessary memory allocations
Bug: 5581637
 Also delete some dead, unused code

Change-Id: If6efd11f5032141dadbfcd0b3215e89b464e5f35
2011-11-07 17:42:06 -08:00
John Reck
99f7b7b7b2 Remove nativeRecordButtons
Bug: 5572238
 Bug: 5558699

Change-Id: I8e275849f4f04c094a93528dd1fb59683d30e9cc
2011-11-07 14:00:05 -08:00
Mangesh Ghiware
69957172fa Merge "Update fix to restore view and text wrap scales." into ics-mr1 2011-11-03 15:35:23 -07:00
Mangesh Ghiware
e59e301ca0 Update fix to restore view and text wrap scales.
Fixes bug 5544556: All email content is wrapped prematurely.

Previous change (I5a22dd20) didn't take a few other cases of
mViewScale>0 into account.

Change-Id: I4f9578f3558f026c472492ac07d19004416dc228
2011-11-03 13:21:18 -07:00
Teng-Hui Zhu
76b067590b Merge "Create GL texture when it is missing for video layer" into ics-mr1 2011-11-03 11:43:16 -07:00
Teng-Hui Zhu
1f54673381 Create GL texture when it is missing for video layer
In any case that the HTMLVideoView is recreated with no GL texture, we should
recreate the GL texture to make sure we always have a valid texture ID.

bug:5530006
Change-Id: I703a987a7530dbeef74e502f3c9ff329beca8c4e
2011-11-02 15:59:25 -07:00
Mangesh Ghiware
274133dfef Merge "Fix setInitialScale() to take display density into account." into ics-mr1 2011-11-01 14:02:05 -07:00
Mangesh Ghiware
00ef15b98a Merge "Clamp initial scale between minimum and maximum values." into ics-mr1 2011-11-01 11:28:01 -07:00
Mangesh Ghiware
e9841bb45d Fix setInitialScale() to take display density into account.
Reverted changes made to fix bug 4982074 (Book text display is limited
to about half the available screen.) The Books app sets initial scale to
100%, and since display density for Crespo is 1.5, initial scale was
actually being set to a smaller value in Device Independent Pixel units.

The correct fix is to take display density into account. This fixes bug
5477652: webview scale factor wrong on prime in reddit app.

Change-Id: Ie09172629add7fb28ca6b47d0fd8f6450c5df569
2011-11-01 09:55:45 -07:00
Mangesh Ghiware
ca4d54c486 Clamp initial scale between minimum and maximum values.
Fixes bug 5515454: web page is not optimized (gmarket)

Initial scale is used to detect mobile sites
In ICS, mobile site detection based on whether the URL included m.,
mobile., wap., etc. has been removed in exclusive favor of the meta
viewport tag.

Within meta viewport tag, mobile site detection uses width (set to
device-width), initial-scale (set to 1.0 or default scale), etc. Make
this logic more robust by clamping initial scale between minimum and
maximum values, if specified.

Change-Id: I663c50ce20b35279d37a8c812e91d6bc4c16c1d3
2011-10-31 14:41:38 -07:00
Marco Nelissen
d763c2cbe8 Make MediaController use low profile system UI
This makes the MediaController iused by the full screen html5 video
view copy the system ui visibility of its owner. Some issues remain.
b/5494143

Change-Id: I6b157226974befbee5ba685d42d1ef72c113664d
2011-10-31 08:34:24 -07:00
Mangesh Ghiware
ade26e2e38 Merge "Fix restore of view and text wrap scales." into ics-mr1 2011-10-27 16:11:32 -07:00
Mangesh Ghiware
f0e96d54b6 Fix restore of view and text wrap scales.
Fixes bug 5507881: Open pages in overview doesn't stick on initial
browser load.

Update the fix for bug 5230909: Zoom not restored on Back.

Added a boolean to indicate that scales have been restored. In the case
of restored scales (view and text wrap) being zero, set them to overview
and reading level respectively.

Change-Id: I5a22dd2040a22ee3b48c5903b586a65a4fa320f2
2011-10-27 15:20:49 -07:00
John Reck
effabe8d8b Keep text handles in sync with native touch targets
Bug: 5522153
 Also add some slop to the handle targets, cleaned
 up the JNI and improved debugging.

Change-Id: I9ac637d793f2bd88d5315aa1483a4513d2496716
2011-10-27 11:32:55 -07:00
John Reck
c0e9fb91c8 Fix rebuildWebTextView issues
Bug: 5488135
 Cherry pick from MR0

Change-Id: I2df047b6de42dbe716008f69d720fa5fad3fe19d
2011-10-21 15:31:33 -07:00
George Mount
930b5654a3 Merge "Fixed spell check failing to change word." 2011-10-21 13:02:05 -07:00
Mangesh Ghiware
760bf7de06 Merge "Fix issue# 5492404: Reading level check thread error." 2011-10-21 12:45:30 -07:00
Mangesh Ghiware
bb99e28cd6 Fix issue# 5492404: Reading level check thread error.
Remove access to WebSettings from getReadingLevelScale() by saving the
double-tap zoom scale factor in ZoomManager. WebSettings can only be
accessed in the UI thread.

Change-Id: Ic7289bf3c14d800797f2e85546a088a9071e0468
2011-10-21 10:53:29 -07:00
Kristian Monsen
43abfe1be2 Merge "WebView part of fix for bug 5307956" 2011-10-21 04:48:22 -07:00
George Mount
f23e1679a2 Fixed spell check failing to change word.
Bug 5387838
 On WebView.rebuildWebTextView, setTextAndKeepSelection was
 being called, erasing the selections. Changed it so that
 when text is replaced with the exact same value, no replace
 is done. Also, on the Google search, when a spelling change
 was made, the final character was placed improperly. When
 a single character is added, the javascript events for the
 character are sent. When multiple characters are changed,
 the entire value is replaced with no javascript key events
 sent.

Change-Id: I791eeb3c96354cfe3cbfda7e8d05c81fcdeb152f
2011-10-19 10:38:32 -07:00
Kristian Monsen
0d491c1dce WebView part of fix for bug 5307956
JniUtil now returns empty string instead of crashing
when the OS can't find/create a cache directory. Have only
seen this happen when the whole file system was broken.

Change-Id: I867017d62dce83cae3e83959eac9e974433bbdc9
2011-10-19 11:48:06 +01:00
Mangesh Ghiware
29a15a237a am 2bd3c2f7: Merge "Fix null ptr exception in getReadingLevelScale()" into ics-mr0
* commit '2bd3c2f7e89eb02f2b240672631c57bc912a9575':
  Fix null ptr exception in getReadingLevelScale()
2011-10-18 10:32:36 -07:00
Mangesh Ghiware
1698d45ef8 Fix null ptr exception in getReadingLevelScale()
Handle the case where WebView settings might be null.

Bug: 5472493
Change-Id: I6b1c2e5e5e56a517910a330ae9d40a4adc99d75a
2011-10-18 09:32:36 -07:00
John Reck
08eaa9de76 am 7788c51d: Merge "Fix onFirstLayout path for saved pages" into ics-mr0
* commit '7788c51d82963a8645655675c675424db694ad85':
  Fix onFirstLayout path for saved pages
2011-10-17 17:50:39 -07:00