History log of /frameworks/base/core/java/android/webkit/ZoomManager.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
6013d8c25b19149de1f57b3a413e3fbd23329d9f 20-Sep-2012 John Reck <jreck@google.com> Fix DPI scaling on TVDPI

Bug: 6891214
tvdpi has a density of 1.3312501 which we fail on as we assume
you can take density and multiply by 100, cast to an int, and
divide by 100f to get back to the original density. Force this
assumption to be true by truncating density

Change-Id: I0caeb7768ee002f935b41c77a5579ffeed491f82
/frameworks/base/core/java/android/webkit/ZoomManager.java
1027ed2aca423101b61256b84776008441253221 01-Sep-2012 Adam Powell <adamp@google.com> Make WebView track focal points more accurately

Change-Id: I6683edee6933b1dd026453935d72119320ab3c81
/frameworks/base/core/java/android/webkit/ZoomManager.java
eba5e7ddfb0752ad84f9a18c6550a3274c9ccec1 05-Jun-2012 John Reck <jreck@google.com> Fix logspam

Bug: 6508832

Change-Id: I3061917ae7eba31723c006b1d30d20b7134890b8
/frameworks/base/core/java/android/webkit/ZoomManager.java
02c2f45ea21fefe2449bfb95c85df746b3a88bdc 15-May-2012 Chris Craik <ccraik@google.com> Invalidate on new picture if scale/content size changes

bug:6497496
Change-Id: Id6de6f83f7bf8a9a4ebcfed61e6b3985d7f19efe
/frameworks/base/core/java/android/webkit/ZoomManager.java
b2676f76b6dd078604754b0a7b3fc3095835570e 02-Mar-2012 John Reck <jreck@google.com> Delete more navcache stuff

Change-Id: Ic32559948b90abb3e8e755c5eb533dd9e83b3190
/frameworks/base/core/java/android/webkit/ZoomManager.java
3c90952036a5ff7ddb2946c643f1a0bf1c31d53a 28-Feb-2012 Jonathan Dixon <joth@google.com> Refactor WebView to be a thin proxy class

Splits interface and implementation; all client calls are forwarded
to an abstract WebViewProvider interface, and the existing implementation
moved into the WebViewClassic implementor of this interface.

Originally taken from a snapshot from the development branch, by:
git diff HEAD 9a4c328a54cc05e5 | git apply
- but then rebased to keep up to date with master

Interdepends on webkit and Browser changes:
https://android-git.corp.google.com/g/158979
https://android-git.corp.google.com/g/167911

Change-Id: I91403f32654ff308934e95c832d17b292a7d9b2e
/frameworks/base/core/java/android/webkit/ZoomManager.java
8d3836c11efa6a33520720b4a3e5caf9d2c01a7f 14-Feb-2012 Mangesh Ghiware <mghiware@google.com> Fix regression in default zoom setting

Bug: 6000309
Change-Id: I4255c847c0e7d2a5ab654014f6f4b5d32b5fdf67
/frameworks/base/core/java/android/webkit/ZoomManager.java
5fe6f951ac0b013be76f2b34b8e87ca6d11010b3 03-Feb-2012 Mangesh Ghiware <mghiware@google.com> Use WebKit hit testing result for centering on double-tap zoom.

Iterate over the bounding boxes and find one large enough to fit the
screen width at reading scale. Align to left edge of said box.

Bug: 5175030
Bug: 5768421
Change-Id: Iac01e145336918b0a2b21d2864f46ba532aaf18f
/frameworks/base/core/java/android/webkit/ZoomManager.java
66b2ff818bdc58465e54d7fc42772857c07fa262 08-Dec-2011 Mangesh Ghiware <mghiware@google.com> Update computation of reading level scale.

Fixes bug 5726043 (Extra double-tap needed to zoom out to overview mode
on nytimes.com on a Stingray)

Change-Id: I54dc303f4aa81ddc38c234228adc915b9f6749dc
/frameworks/base/core/java/android/webkit/ZoomManager.java
059832790df137796c14371b3cbd19b6263c8280 02-Dec-2011 John Reck <jreck@google.com> Fix updateDoubleTapZoom logic

Bug: 5698099

Change-Id: I83578e57cf809cbe7781d988302f0925dfddec80
/frameworks/base/core/java/android/webkit/ZoomManager.java
d3788b97c9a28e8cbfa4432389a5de04073a333b 29-Nov-2011 Teng-Hui Zhu <ztenghui@google.com> Merge "WebView animation support" into ics-mr1
8fae09d575161a54f2b5863d996e7acd7390e5a0 28-Nov-2011 Derek Sollenberger <djsollen@google.com> Update Webkit with the zoom level after double tap gesture

In the hardware accelerated case we were not updating webkit
with the new zoom information. This was causing plugins to
render at the old zoom level.

bug: 5663981
Change-Id: I3cb18ad9ca4f185f384ea9fb68780f29160391ad
/frameworks/base/core/java/android/webkit/ZoomManager.java
7ae9f3ab5517a3d58cc1f462d4a920cbe42a4213 14-Nov-2011 Teng-Hui Zhu <ztenghui@google.com> WebView animation support

Fix the jumping issue when double tapping

bug:4982054
Change-Id: Ifb67030a3132fe3820a1fcc8ffc97a1ab474c223
/frameworks/base/core/java/android/webkit/ZoomManager.java
e832b63c97c18c8170643c5a1c565e07893c5368 16-Nov-2011 Mangesh Ghiware <mghiware@google.com> 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
/frameworks/base/core/java/android/webkit/ZoomManager.java
e59e301ca0e28d88439c626b7d177e7eeac06456 03-Nov-2011 Mangesh Ghiware <mghiware@google.com> 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
/frameworks/base/core/java/android/webkit/ZoomManager.java
e9841bb45d32685cf1371659fbf5ce4a3b88e782 01-Nov-2011 Mangesh Ghiware <mghiware@google.com> 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
/frameworks/base/core/java/android/webkit/ZoomManager.java
f0e96d54b6fb05bf0b4c40a9e918beb2e52bc819 27-Oct-2011 Mangesh Ghiware <mghiware@google.com> 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
/frameworks/base/core/java/android/webkit/ZoomManager.java
bb99e28cd69c7a3ab355873130242373282295a5 21-Oct-2011 Mangesh Ghiware <mghiware@google.com> 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
/frameworks/base/core/java/android/webkit/ZoomManager.java
1698d45ef83b26d2d4e9914c2fea19be6819f207 18-Oct-2011 Mangesh Ghiware <mghiware@google.com> Fix null ptr exception in getReadingLevelScale()

Handle the case where WebView settings might be null.

Bug: 5472493
Change-Id: I6b1c2e5e5e56a517910a330ae9d40a4adc99d75a
/frameworks/base/core/java/android/webkit/ZoomManager.java
edb528ef52fd9b0148d559c5e596cf9bb9a6d2f9 12-Oct-2011 Mangesh Ghiware <mghiware@google.com> Add setting for configuring zoom level on double-tap.

In overview mode, text wrap is done at reading level scale. If user
changes double-tap zoom in overview mode, reflow text at the new scale.
In any other mode, a double-tap will take user to overview mode, at
which point, the text will be reflowed at the updated reading level
scale.

Bug: 5312461
Change-Id: I29be34a32246019101a9a875e1758e22b5af2bd3
/frameworks/base/core/java/android/webkit/ZoomManager.java
faab93d1acb9738c8e2d90e20e19facc0e3eea6e 21-Sep-2011 Mangesh Ghiware <mghiware@google.com> Use overview scale when restored scale is 0.

If restored scale and text wrap scale are set to 0 (meaning the previous
scale wasn't saved), set them to overview and reading level scale
respectively.

Bug: 5230909
Change-Id: If7724e9a0cd948c88d0a001728266a3282083bdc
/frameworks/base/core/java/android/webkit/ZoomManager.java
886b372b52d122d25f95ef39833254197bebba69 10-Sep-2011 Mangesh Ghiware <mghiware@google.com> On zoom to overview, reflow text, if necessary.

Reset the text wrap scale to the correct value (i.e., reading level
scale) on zoom to overview. This addresses the scenario where text is
wrapped at a larger scale following a pinch zoom and double tap to
reflow.

Bug: 5254253
Change-Id: I57f706ef4254dd3f194cc35f109dd48b61b72f73
/frameworks/base/core/java/android/webkit/ZoomManager.java
b5f9fc32ec3972694b626ab93991b0b9de97749a 01-Sep-2011 Mangesh Ghiware <mghiware@google.com> Set reading level scale to display density instead of a fixed minimum.

On a double tap, zoom to either reading level scale or 0.5f more than
current (overview) scale, whichever is greater. This addresses the
scenario for large screen devices where overview and reading level scale
are the same.

Bug: 5165527
Change-Id: I50216d60f98b2904f06742336b9c8c7c512328a6
/frameworks/base/core/java/android/webkit/ZoomManager.java
3e066c35e8a9f1a77b815791aac02e6a7f4e0808 26-Jul-2011 Huahui Wu <hwu@google.com> b/5080166 Enalbe multi-touch on external touch escreen.

Change-Id: I49d44528283a6b47a4caa95bec3c1837f500b004
/frameworks/base/core/java/android/webkit/ZoomManager.java
5f4835af72418cd13a746b5b7677ae130c20d46a 21-Jul-2011 Huahui Wu <hwu@google.com> b/4070489 Jumpy motion when switching fingers during zoom gesture.

Change-Id: Ia7845cef5e58b4922e4475e48085b7b95e15bea2
/frameworks/base/core/java/android/webkit/ZoomManager.java
07ac175452a4ba984a478a29416b8c4da2fce28f 11-Jul-2011 Shimeng (Simon) Wang <swang@google.com> Set mActualScale when initialScale is set.

This sets mActualScale to be correct value if initialScale is set.

issue: 4982074
Change-Id: I69d12d185710e89fc91a3a6bdf566c7092f059b7
/frameworks/base/core/java/android/webkit/ZoomManager.java
e5f5e82027f551d70eecdcbafec864ed07fb67b1 09-Jul-2011 Shimeng (Simon) Wang <swang@google.com> Merge "Prevent set mInitialScale being overridden by mDefaultScale."
1151fe78fc96e5869ec7adb437966e22c94902e0 08-Jul-2011 Shimeng (Simon) Wang <swang@google.com> Prevent set mInitialScale being overridden by mDefaultScale.

If mInitialScale is set, use it as the default scale; otherwise,
it'll be overridden by default density in case of book app where
mobile fixed viewport is used; since today the default scale is used
to calculate the mobile fixed viewport.

issue: 4982074
Change-Id: I21c2bf41478bb97351cb3fb1cc3735ab7d75e164
/frameworks/base/core/java/android/webkit/ZoomManager.java
1bf0456b290c9c1428d192a1134ded28b4d6c777 06-Jul-2011 Shimeng (Simon) Wang <swang@google.com> Treat restored defaultScale as overview.

Since usually restored defaultScale means previous scale is not saved.

issue: 4975315
Change-Id: Icc34469d0459fb5254567fe9f3cc5032b6349405
/frameworks/base/core/java/android/webkit/ZoomManager.java
56528a3546777bd6e6739b0d99d67ec7598e06ea 30-Jun-2011 Shimeng (Simon) Wang <swang@google.com> Merge "Keep initial zoom overview for non-standard load."
72a1d2e1386fcf1795621c2eeb05287d46c7278c 30-Jun-2011 Shimeng (Simon) Wang <swang@google.com> Keep initial zoom overview for non-standard load.

In case of non-standard load such as reload, currently the ZoomManager's
onFirstLayout will not be triggered, hence initial zoom overview will not
be set.

This change provides a fix to set initial zoom overview in case of
non-standard load for the new picture after first layout.

issue: 4975315
Change-Id: If2ba3e472f2bb7b6fc4c52024d18a66dc1e41a23
/frameworks/base/core/java/android/webkit/ZoomManager.java
50e04e2d45ad7eaa5305155779a8611ffb364d89 29-Jun-2011 Shimeng (Simon) Wang <swang@google.com> Initial zoom overview flag only meaningful in page overview mode.

Change-Id: I206864678e61777276468718a78e3da8de4f06a7
/frameworks/base/core/java/android/webkit/ZoomManager.java
e86cdeb86c1158c00986ea700109c289e7686853 10-Jun-2011 Shimeng (Simon) Wang <swang@google.com> Fix reflow for mobile sites.

1. use correct mDefaultScale instead of 1.0f.
2. ignore mMinZoomScaleFixed in case of using wide viewport since
sometimes mobile site will impose a min scale while the web content
will make it bigger than overview scale.

issue: 4257815

Change-Id: Ib4ca9b4dab8585827081a32432076eeeaedecd38
/frameworks/base/core/java/android/webkit/ZoomManager.java
136c20b88e14fffe570cdbd67fa7d227ab34bf1f 09-Jun-2011 Shimeng (Simon) Wang <swang@google.com> Better handle double tap for smooth reflow and zoom.

In case it's the first time to reflow or the page is in zoom overview
mode, let the reflow and zoom happen at the same time to avoid the
need of double tapping twice.

Also fix the viewport width to webview's original width for mobile
site.

issue: 4482888
Change-Id: Ic7c73a9eb3f75fd68322f7f4da14141126e75ad8
/frameworks/base/core/java/android/webkit/ZoomManager.java
ebf762777af9169bc8c4027375714e309f587c6a 02-Jun-2011 Shimeng (Simon) Wang <swang@google.com> Make sure scale will not go beyond overview scale after rotation.

Change-Id: If8f7fe131814102e6abf5c8d59888d17a7200003
/frameworks/base/core/java/android/webkit/ZoomManager.java
73bb5734f06adc3b61a102fcb2f5295caa9e4886 01-Jun-2011 Shimeng (Simon) Wang <swang@google.com> Fix overview scale setting for mobile sites.

This fix will only set the overview scale in case the screen
is rotated from landscape to protrait, since in this case
the overview scale will be smaller and need explicit setting.
For the other way around, there's no need to set and it has wrong
effect for mobile sites.

issue: 4343683
Change-Id: I92cbf848bc2ed4184bd0c6b67992ff5cbc633c9f
/frameworks/base/core/java/android/webkit/ZoomManager.java
09cb64bcd1183fe83d3abd7af00424f9ed9cc699 27-May-2011 Shimeng (Simon) Wang <swang@google.com> Fix zoom overview width and postscale for non-wide-viewport mode.

issue: 4396010
Change-Id: I90aefac9fdf53834c0774d5c1b37693413798689
/frameworks/base/core/java/android/webkit/ZoomManager.java
24a252e634d4658df32abef3b258785c5e1ae819 25-May-2011 Shimeng (Simon) Wang <swang@google.com> Simplify viewport logic in webviewcore and zoom-manager.

As using wide viewport implies fixed viewport.

Also fixed an issue for mobile page viewport calculation.

issue: 4343683
Change-Id: I669618f8522377ff97317bb1b78700ad40e51bb3
/frameworks/base/core/java/android/webkit/ZoomManager.java
a249a93e8d7166e503992d32eaf44f9e53c16753 18-Mar-2011 Derek Sollenberger <djsollen@google.com> 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
/frameworks/base/core/java/android/webkit/ZoomManager.java
c37308f11680f597d09fa783665ba3104d6e6d5c 11-Mar-2011 Adam Powell <adamp@google.com> Fix bug 4083825 - Gesture zoom locked along content edges under some
circumstances

Tune the procedure used to handle "zoom slop" during a webview
pan+zoom gesture.

Change-Id: Ia706722ba6a46e64cce8814d4668e3857b16e562
/frameworks/base/core/java/android/webkit/ZoomManager.java
31484fbe28c347af40331135a1bc2634d3534d26 11-Mar-2011 Huahui Wu <hwu@google.com> b/4080388 Improving the performance of ZoomManager

This is a re-factor of cl b/3307761.
It uses an circular array to implement the queue instead of linked list.
And it saves the time to convert float to Float.

Change-Id: I1076aabec2310b2cc299d7f485bf9c4710107045
/frameworks/base/core/java/android/webkit/ZoomManager.java
3911b45005048e727cdc8f6ae58fd722e36f95fa 10-Mar-2011 Shimeng (Simon) Wang <swang@google.com> Don't limit zoom scale change by the minimum increment.

issue: 4080125
Change-Id: I3fa258e12e7aa44c7286c9dccb1f249d5ae78a12
/frameworks/base/core/java/android/webkit/ZoomManager.java
37c2e3e55641e91dd0ec3dbd296bc6bc7c7641cf 10-Mar-2011 Huahui Wu <hwu@google.com> Merge "b/4075349 Make the pinch to zoom more responsive after limits." into honeycomb-mr1
ff6f4c2eff8a676187296b968388f80e744a9ce8 09-Mar-2011 Huahui Wu <hwu@google.com> b/4075349 Make the pinch to zoom more responsive after limits.

Change-Id: I66ea0aa95ff6a471b7c2ae2cb1ce2fdd0f18ce01
/frameworks/base/core/java/android/webkit/ZoomManager.java
12c37cafe184d5a6ac2a7a097c2fc616e5c1a6c8 09-Mar-2011 Shimeng (Simon) Wang <swang@google.com> Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1
633c3775a9313456077c654a3a2cd306161d1a4a 08-Mar-2011 Shimeng (Simon) Wang <swang@google.com> Consider mInitialScale when setting min zoom scale.

This fixes CTS test failure.

issue: 4056256
Change-Id: Iee4adba2e462f5e0e79cf359e5b6a1531eafcdd8
/frameworks/base/core/java/android/webkit/ZoomManager.java
463cc0c5e2b9f63187e8d091dd709e93686beb75 07-Mar-2011 Huahui Wu <hwu@google.com> b/3307761 Tuning two fingers pan.

User reports jumpy when trying two fingers pan. This change keeps
track of the previous movements of the fingers' middle point,
compares to the change of the fingers' distance, and decides
to pan or zoom or do both.

Change-Id: I8a6a8e9259db85b0e820b6e25ba0822ed289fb45
/frameworks/base/core/java/android/webkit/ZoomManager.java
47e57fd18f361900e3c3c98f4e0dea54e1694268 04-Mar-2011 Shimeng (Simon) Wang <swang@google.com> Shorten the animation length to make it snappier.

This is double tap zoom animation.

issue: 3509451
Change-Id: Ibc09eb95f3e1aa6874e8182f811829ce3da7179d
/frameworks/base/core/java/android/webkit/ZoomManager.java
9cedbcfdf5ad33162019914f26ad8137b84927de 02-Mar-2011 Shimeng (Simon) Wang <swang@google.com> Adjust actual scale when zoom density changes.

Also some fine tuning of zoom scales.
1. Since overview scale will be used to determine min zoom scale, its own
computation shall be free of min zoom scale.
2. make sure mMaxZoomScale is at lease mMinZoomScale.
3. Use default scale in case of non-overview mode, since it reflects the
current zoom density.

issue: 3494868
Change-Id: I4297878b820e437b706bb7e0f143336ff1b39f82
/frameworks/base/core/java/android/webkit/ZoomManager.java
25c0619b4b48cef4e1255fd1c49ff390f83bece0 02-Mar-2011 Shimeng (Simon) Wang <swang@google.com> Merge "Revert "Remove the limitation that zoom can't go beyond overview scale.""
2c4ab3a51006431da7f2ce46e007cc52c45cb1cf 02-Mar-2011 Shimeng (Simon) Wang <swang@google.com> Revert "Remove the limitation that zoom can't go beyond overview scale."

This reverts commit f1b391a1e3fc51f90f3afaae6623540cab326c8d.
/frameworks/base/core/java/android/webkit/ZoomManager.java
ac382cf581eb24937033ccd2a21d3d2f02f07767 01-Mar-2011 Derek Sollenberger <djsollen@google.com> Don't update webkit at every stage of a zoom animation.

This CL defers updating webkit until a zoom animation has completed.

bug: 3451126
Change-Id: I75a90f307a3493363811ba67ec4e55bfec9c0702
/frameworks/base/core/java/android/webkit/ZoomManager.java
f1b391a1e3fc51f90f3afaae6623540cab326c8d 28-Feb-2011 Shimeng (Simon) Wang <swang@google.com> Remove the limitation that zoom can't go beyond overview scale.

Also scales the zoom level when zoom density changes.

issue: 3494868
Change-Id: I23ef9e1bad9c042ca0edf05dce60454b17eb0ade
/frameworks/base/core/java/android/webkit/ZoomManager.java
61bb911938d055ece3a95f9ba5aa014175a37fa4 25-Feb-2011 Shimeng (Simon) Wang <swang@google.com> Make sure pinch zoom and overview scale are within limits

issue: 3482463
Change-Id: I9d746883c03326bdfa7fb0373ffadfbc75f69087
/frameworks/base/core/java/android/webkit/ZoomManager.java
76064644a73b09ef29c3cd361e450eff88850443 23-Feb-2011 Shimeng (Simon) Wang <swang@google.com> Pre-calculate view scale and text wrap scale for webkit.

In viewport setup time, pre-calculate the more likely view scale
and text wrap scale instead of waiting until ZoomManager's FirstLayout
time. This is to give webkit better and more correct information, such
as window width/height and inner width/height, when it is doing first layout.

issue: 3382398
Change-Id: I53fb15da43fbede6c03a4f51ec1c50e9a94f0236
/frameworks/base/core/java/android/webkit/ZoomManager.java
a05fa96834d74b195fe8e26ca412d5bf7e7f66dc 18-Feb-2011 Shimeng (Simon) Wang <swang@google.com> Make sure zoom width is changed before fit-to-screen.

issue: 3466509
Change-Id: I7cdb9544fcb3f261ebd0a831ab4a5cd685c5fc77
/frameworks/base/core/java/android/webkit/ZoomManager.java
459c42395648193bb13ed8a4bcf5c58af9cac3c5 18-Feb-2011 Shimeng (Simon) Wang <swang@google.com> Reset initial zoom overview state when user takes zoom action.

This will prevent wrong fit-to-screen when a new picture comes.

issue: 3466509
Change-Id: I37d5509190766ba16665527bbdef968bddff8915
/frameworks/base/core/java/android/webkit/ZoomManager.java
d75fd491eaa7b10c20759a2b98ca78104c7047ce 16-Feb-2011 Shimeng (Simon) Wang <swang@google.com> Fine tune the zoom overview behavior.

issue: 3451476
Change-Id: Idc267979ae0b33f4f2fbcb9aab7739bdd1dc1eff
/frameworks/base/core/java/android/webkit/ZoomManager.java
96b065f0014653821c1a1b69e7b13a00d02c38b0 16-Feb-2011 Shimeng (Simon) Wang <swang@google.com> Remember zoom overview state since the postscale callback is async.

issue: 3451476
Change-Id: I56eaeff4e35f8a791b990fcdd1188ca6cdef601a
/frameworks/base/core/java/android/webkit/ZoomManager.java
0f7c903aa188b359290f8b80b28a2e874c4e26ac 16-Feb-2011 Shimeng (Simon) Wang <swang@google.com> Merge "Fit to screen for the first new picture with enough different width."
7c6aaf062bf821afa76e810cb365703516770754 16-Feb-2011 Shimeng (Simon) Wang <swang@google.com> Fit to screen for the first new picture with enough different width.

This is to fix cases where the content width is keep changing due to
animation, such as 2011 google io site.

issue: 3451476
Change-Id: I8b1ba27a34e37a18116131ecc60391975ef75788
/frameworks/base/core/java/android/webkit/ZoomManager.java
a94e0c8651fc103cbe33b6bd8777ba9ea83830a5 15-Feb-2011 Shimeng (Simon) Wang <swang@google.com> Merge "Keep overview mode when screen is rotated."
a5b3d807a192e14ae7e5c11353633c08ff5aaae6 15-Feb-2011 Shimeng (Simon) Wang <swang@google.com> Keep overview mode when screen is rotated.

issue: 3385613
Change-Id: I49ba8dbdfe72adb1df5e453d7c95ec107e0d3e75
/frameworks/base/core/java/android/webkit/ZoomManager.java
a7699fea04a5ef313e9f555537f2ff5595cd1291 15-Feb-2011 Shimeng (Simon) Wang <swang@google.com> Keep mobile site's text wrap scale unchanged.

issue: 3376306
Change-Id: Ifce67215486f09eadb34c30c085b0e502a5a8b05
/frameworks/base/core/java/android/webkit/ZoomManager.java
811ba6c6a270f3ba248a61f12c3112d85da8b99a 26-Jan-2011 Ben Murdoch <benm@google.com> Implement the double tap to zoom animation with HW accleration.

Bug: 3164010

Change-Id: I6d3b5973ee0aa95dd810755263e615e226cc965b
/frameworks/base/core/java/android/webkit/ZoomManager.java
66064914fc97f8b0a6cb1cc6e7a1266dd7cc4a3b 21-Jan-2011 Shimeng (Simon) Wang <swang@google.com> Keep min/max zoom scale in proportion when zoom density changes.

issue: 3341610
Change-Id: Ibf87ab499e28fddab81d4e354ec7d88f5eb86261
/frameworks/base/core/java/android/webkit/ZoomManager.java
745a529249c346656a404e38333f6d0ce6503fd7 19-Jan-2011 Romain Guy <romainguy@google.com> Merge "Smoother pinch-zoom in Browser." into honeycomb
4f066784ec0b921c9aacc48dd6ce3c5d50764233 19-Jan-2011 Romain Guy <romainguy@google.com> Smoother pinch-zoom in Browser.

Change-Id: Ie5a403b76ab25483a980324cd7b31976359fa796
/frameworks/base/core/java/android/webkit/ZoomManager.java
dd1173bc9be22a2bb5054a760a74d3d5e49161ed 18-Jan-2011 Derek Sollenberger <djsollen@google.com> Fix smart zoom for plugins that use OpenGL.

bug: 3331323
Change-Id: I4f1d4e0ecdb75283fc781bf5afe579f43610506c
/frameworks/base/core/java/android/webkit/ZoomManager.java
acd944cce270dd516950853f91ebb48235914161 11-Jan-2011 Huahui Wu <hwu@google.com> b/3331379 reduce ping-to-zoom jitter.

Change-Id: I522c86661777e670776b9fb448dc3333cef8b77b
/frameworks/base/core/java/android/webkit/ZoomManager.java
e85ffea862a6b140269ac1b62372d4e9066fcf9c 07-Jan-2011 Shimeng (Simon) Wang <swang@google.com> Make sure the reading level scale is within min/max limits.

This potentially helps the following issue. But anyway, this change
is good to have.

issue: 3292648
Change-Id: I0ad74b802d7ce2c3d66de8115187638f1d5e72ff
/frameworks/base/core/java/android/webkit/ZoomManager.java
2c782e3d537c8b5b5182647c36a91bfc601684e6 04-Jan-2011 Shimeng (Simon) Wang <swang@google.com> Refactor zoom overview width calculation.

Refactor zoom overview width calculation in FirstLayout and NewPicture;
also taking care of the case when wide viewport is not enabled.

This fixes the setInitialScale Cts test case, which is broken by some
scale related changed for fixed viewport browser.

issue: 3242034
Change-Id: Ie54d089763ee38029ef25e6029884a17c2135f97
/frameworks/base/core/java/android/webkit/ZoomManager.java
63814df667df0adb28eb78e6736ca5c10cd5187a 12-Dec-2010 Adam Powell <adamp@google.com> Smooth out gesture zooming in WebViews.

Change-Id: I42c1182f82af3ed16cd23efc056d7c9c34e32940
/frameworks/base/core/java/android/webkit/ZoomManager.java
88ec644d67ff774b7f2366440c78b5c6ff0cd957 07-Dec-2010 Shimeng (Simon) Wang <swang@google.com> Prevent scaling beyond zoom overview scale.

issue: 3243899
Change-Id: I1d6cbb1b1f75c7aadb3b9cc6e82d912217508dc4
/frameworks/base/core/java/android/webkit/ZoomManager.java
96fcb87ae1e3e206dcf3dab54048bcea255e339f 25-Nov-2010 Shimeng (Simon) Wang <swang@google.com> Set initial view scale to be at least overview scale.

Some website will have an initial view scale which is less
than the overview scale and the page will display poorly.

This fix sets the initial scale and text wrap scale to be at least
overview scale to make the page looking good at first load. When a page
is restored, the scale will not be changed.

Also make the reading level scale always bigger than overview
scale for consistency.

issue: 3226625
Change-Id: I8b77cf4fda454a35c3037fa09aaff1aac0c0f664
/frameworks/base/core/java/android/webkit/ZoomManager.java
20c14fd7b31dfb333dfafbf7055c16160e8cc1dd 16-Nov-2010 Shimeng (Simon) Wang <swang@google.com> Ignore zoom overwidth updating when contentsize is not set.

This happens in case of layer's webkit draw time.

issue:3194817
Change-Id: I58c393d7553e279ccd4b4ee755e2da205faa069b
/frameworks/base/core/java/android/webkit/ZoomManager.java
515f6d8db3f02eaa010eee78c504c71d1a2d6a7a 12-Nov-2010 Derek Sollenberger <djsollen@google.com> Only show double-tap tip if the feature is enabled.

bug: 3170472
Change-Id: I41a278ff44a7fba807c3a4a22f0e0ea20d137d0a
/frameworks/base/core/java/android/webkit/ZoomManager.java
dbf5ff294aafc52c1defc0b1bcf3893331ef0c27 10-Nov-2010 Shimeng (Simon) Wang <swang@google.com> Update textwrap scale when content width changes in overview mode.

This is mostly for sites which will change content width when first
loaded such as nytimes.com.

Also zoom to reading level if the zoom overview scale has very
little diff from current actual scale.

issue: 3003933
Change-Id: Ie4b32bf6ac109eef145cd59b31f04077226b9052
/frameworks/base/core/java/android/webkit/ZoomManager.java
619ded23cee14ccf97f4917ed10afe78be0d2610 05-Nov-2010 Shimeng (Simon) Wang <swang@google.com> Use minPrefWidth instead of viewsize.x.

This is to fix a bug I introduced in one of my last CLs, which is tested
under hw accerlation, and the problem was not there.

issue:3161799
Change-Id: Ic7e7c186d1830c3cbd9359af0e283afbbdfbbac1
/frameworks/base/core/java/android/webkit/ZoomManager.java
27c31388e4e9be97f3b5e08cef93e3c8c9fc6a23 03-Nov-2010 Shimeng (Simon) Wang <swang@google.com> Prevent 0 content width.

Sometimes content will be set to 0 from webkit.

issue: 3161799
Change-Id: Ib17322c2e71535105d0f961674cedce63f66a534
/frameworks/base/core/java/android/webkit/ZoomManager.java
c55886aee84034f7fcf4431fdbeeaff1a9eafbd9 28-Oct-2010 Shimeng (Simon) Wang <swang@google.com> Stabilize reflow, aka, the fit-to-screen option in settings.

This change is only for tablet device which has large screen and
good for fixed viewport.

The reflow will only happen in first layout and double tap if the
text wrap scale is not desired.

The initial text wrap scale is set to the reading level, so that if
the web page is in overview mode, after a double tap, the text will
be nicely shown full screen without any reflow.

All the previous reflowing, such as done when zoomed out, are disabled for
tablet device.

issue: 3003933
Change-Id: I8f460704bb27c50d6f5fa259ca2d5007648adfba
/frameworks/base/core/java/android/webkit/ZoomManager.java
767dbefbe0effdfbe53e14eb1fd499cdd2b0fdc4 27-Oct-2010 Shimeng (Simon) Wang <swang@google.com> Fixes "open pages in overview" option.

This option was disabled when doing fixed viewport.
This is fixed with the intention to show at least overview scale,
which will be also fine with phone.

issue:3131279
Change-Id: I2e65d40a90a04f2ca72882fec8096dd8a0d81cb0
/frameworks/base/core/java/android/webkit/ZoomManager.java
7e6bf6ff0f585a12e9c1effc5755137b2612a709 28-Oct-2010 Derek Sollenberger <djsollen@google.com> Rename some variable to make it clear what data is being stored.

The object that carries drawing data between WebViewCore and WebView
uses ambiguous variable names that do not fully convey the meaning
of the values. This change updates those names to make it clear to
the reader what the intention of those values is.

Change-Id: I5a403d44881e1fad366f3ec9930ee59134eccd88
/frameworks/base/core/java/android/webkit/ZoomManager.java
8117e760ee3097b05af9b092bdff5f0c6d7f0d35 22-Oct-2010 Shimeng (Simon) Wang <swang@google.com> Let double tap reflow text.

In case when the text wrap scale is out of sync of the zoom scale.

issue:3122512
Change-Id: I9619cc603226503b96e3a0766620bc2884ec1805
/frameworks/base/core/java/android/webkit/ZoomManager.java
8db525a9ad64699a7553647abb8bc9efa2418abd 21-Oct-2010 Shimeng (Simon) Wang <swang@google.com> Let restored scale be in effect.

This change reverts some previous change to solve macworld.com scale issue.

issue: 3117312
Change-Id: Id822c7f9c196522a24c0b7657225560dcd0e51e4
/frameworks/base/core/java/android/webkit/ZoomManager.java
c42f8b833241162968c5dbdedc18859908730823 14-Oct-2010 Shimeng (Simon) Wang <swang@google.com> Remove not-used code.

issue: 3003933
Change-Id: I3221fb253fe6fbfe9e24368426d7e4a2c1e3502b
/frameworks/base/core/java/android/webkit/ZoomManager.java
afc1c25177b7699dc6c0a3eab2bec4ca055a7e70 14-Oct-2010 Shimeng (Simon) Wang <swang@google.com> Fixed viewport enhancement for site with viewport tag.

1. Use web content width to calculate overview scale in firstLayout time.
2. Skip pre-calculated viewScale in non-mobile fixed viewport case.

issue: 3003933
Change-Id: Ifdc475d96f5df824912197bf5818f5e649658edf
/frameworks/base/core/java/android/webkit/ZoomManager.java
6d383aadce15306e5c5e9af704cd8dfc1fafc16a 14-Oct-2010 Shimeng (Simon) Wang <swang@google.com> Use real fixed viewport, and let the content width be the overview width.

issue: 3003933
Change-Id: I679fe1d5736daf0e8cee746dee53558943796833
/frameworks/base/core/java/android/webkit/ZoomManager.java
938a1142d631cad5bc294deefb9571f9e50151d5 21-Sep-2010 Shimeng (Simon) Wang <swang@google.com> Make the reading level scale at least 0.5f apart from overview level.

This is related to the zoom behavior when user double taps.

Change-Id: Ie36519114ad30aaa9fb32c7164f0d3e841f7d721
/frameworks/base/core/java/android/webkit/ZoomManager.java
a8f99bbbbc89014a2c38637f8e2179f0cd578b11 17-Sep-2010 Shimeng (Simon) Wang <swang@google.com> Use website specified viewport.

In fixed viewport mode, use website specified viewport to override
the default fixed viewport.

issue: 3007588
Change-Id: I0ed86a2f829d18bf35dba47f766b23be1ace8ff5
/frameworks/base/core/java/android/webkit/ZoomManager.java
be36668499683d838e9b0c81d6de6abc1a8bc429 12-Sep-2010 Adam Powell <adamp@google.com> resolved conflicts for merge of 12e08f3a to master

Change-Id: Ic691ec7716d5c450406717d3748847cb9c6b7e82
6fe3b421fdc5b109cbf9006f44c9f089224a817d 19-Aug-2010 Michael Kolb <kolby@google.com> Add setting for on screen zoom buttons
enables to use pinch to zoom without
showing the on screen buttons

Change-Id: Ifd08d11232e2a32178a89e559b6f1f645bf627b9
/frameworks/base/core/java/android/webkit/ZoomManager.java
0ed2bb5e566aee763e7a4ff22a58db9f424e6e9c 19-Aug-2010 Shimeng (Simon) Wang <swang@google.com> Set the scale to be at least overview zoom scale.

This happens when screen is rotated. Also removed a not-needed calculation.

issue: 2919307
Change-Id: If24ccb45a488aa8f00fead09206bfbe1799ebcb2
/frameworks/base/core/java/android/webkit/ZoomManager.java
c1cba781d37910e61591cffda50633f1db6cc4ea 17-Aug-2010 Shimeng (Simon) Wang <swang@google.com> Use fixed viewpport for tablet device.

This makes the zoom animation much more smooth. With previous dynamic
viewport, the animation jumps because of viewport adjustment and big
screen.

Also the viewport width is changed from 800 to 1040 to better suit
the tablet device. It's the middle point of 1280 and 800.

The text reflow re-alignment for non-double-tap zoom is disabled for
tablet, since most of the time the reflow has no effect.

issue: 2919307
Change-Id: I74493df6408291c24ef8511512d7ed0b81bf507a
/frameworks/base/core/java/android/webkit/ZoomManager.java
54038acc8c5b85618911b9ca07403da365adfc97 14-Aug-2010 Shimeng (Simon) Wang <swang@google.com> Update variable to reflect its true value.

The stale value will happen when rotating the large screen and make
double tapping not behave well.

Alternatively, shall we get rid of this variable?

issue: 2919307
Change-Id: I2d71e547db42adeb5674accbf79fb0e7fc587fcd
/frameworks/base/core/java/android/webkit/ZoomManager.java
dde858cbb6dd96e621616b20bb5a6866565b4874 12-Aug-2010 Shimeng (Simon) Wang <swang@google.com> Change scale for large screen reading when double tapped.

This happens when default and overview scales have not much difference.

This solves the double tap issue for large screen devices,
where overview and default scale are the same. The code works well
with phone device as well.

Change-Id: Iac7f66369d58a152de8de7025b326d1672da30d4
/frameworks/base/core/java/android/webkit/ZoomManager.java
d5c6a16b51ef26938f0e537524b524ac4677d79b 01-Jul-2010 Shimeng (Simon) Wang <swang@google.com> Fix zoom overview logic.

issue: 2778976
Change-Id: Id859c473190d067e378cf149d9a7bf9e914ee6e7
/frameworks/base/core/java/android/webkit/ZoomManager.java
b983c893d4307caec8504e6b46ca69ae859b25d3 28-Jun-2010 Derek Sollenberger <djsollen@google.com> Rename a data storage object to better reflect its intended usage.

Change-Id: I18eae0665b59e7fee389a0e09955c5860a7e65f2
/frameworks/base/core/java/android/webkit/ZoomManager.java
4aef697d58bc142b96953cb2623b06981af2abc9 24-Jun-2010 Derek Sollenberger <djsollen@google.com> Initial pass at unit tests for ZoomManager.

This CL also includes some minor changes to the ZoomManager that
make the manager easier to test as well as fix some uncovered issues.

Change-Id: I66a84d70ee75e765ccf9cccb2d123757a9470f93
/frameworks/base/core/java/android/webkit/ZoomManager.java
94345f45e7b82a22eb1e71205612315b7f44c2b4 25-Jun-2010 Derek Sollenberger <djsollen@google.com> Fix zoom overview mode bug in the zoom manager.

Change-Id: Ia4c95e8014976ff6a1c5f3b19030abd78b532f96
http://b/2793303
/frameworks/base/core/java/android/webkit/ZoomManager.java
bffa851f042abe1b123b24ba332ff0095ec18a92 10-Jun-2010 Derek Sollenberger <djsollen@google.com> Finish refactoring zoom logic from WebView to ZoomManager.

This is the final CL in a series of CL's that moved the
location of the zoom logic from WebView to ZoomManager.

Change-Id: Ie1e80b9b3108bd4cb0b0ee2822dc984da91c2d86
http://b/2671604
/frameworks/base/core/java/android/webkit/ZoomManager.java
15c5ddb7fd6357ea8ba2cccb18284137b8113401 10-Jun-2010 Derek Sollenberger <djsollen@google.com> Refactor the double tap zoom code into ZoomManager.

This CL is one in a series of CL's that is intended to refactor
the zoom logic from WebView to ZoomManager.

Change-Id: Icf88f7bd45068dddb31913903403acc7a8f21063
http://b/2671604
/frameworks/base/core/java/android/webkit/ZoomManager.java
369aca27ec44274d9e70e91513914fa2564c6aef 09-Jun-2010 Derek Sollenberger <djsollen@google.com> Consolidate common zoom code and tighten access to some ZoomManager variables.

This is a single CL in a series of CL's that is focused on moving the
zoom logic from WebView to ZoomManager.

Change-Id: I741fc34d5dd481b89f6e0b33503834c33f4fe69e
http://b/2671604
/frameworks/base/core/java/android/webkit/ZoomManager.java
293c360ffe2980b4d5d2d7c4aff69166ff265e9c 04-Jun-2010 Derek Sollenberger <djsollen@google.com> Move pinch-to-zoom logic into ZoomManager.

This CL is one in a series of CL's that moves the zoom logic
from WebView into ZoomManager.

Change-Id: I9980dd78dbc3345d465d4f39afcfd2f025f45bcb
http://b/2671604
/frameworks/base/core/java/android/webkit/ZoomManager.java
341e22ffceb5be2dd143e749aa2d85ef1e0dd53f 02-Jun-2010 Derek Sollenberger <djsollen@google.com> Refactor zoom logic from WebView to ZoomManager.

This CL is one in a series of CL's intended to remove the zoom
logic from WebView. This CL focuses on refactoring the initialScale
variable as well as the onSizeChanged() and NEW_PICTURE_MSG portions
of the code.

Change-Id: Id44bce50378aa7cdfc1c8110818e18500679c517
http://b/2671604
/frameworks/base/core/java/android/webkit/ZoomManager.java
6164ef1b78602a41f81b02355cfbe8516837dcd6 02-Jun-2010 Grace Kloba <klobag@google.com> Expose canZoomIn and canZoomOut for WebView.
/frameworks/base/core/java/android/webkit/ZoomManager.java
87b17be55e02e3d5aef146bfd3caa5116088afd8 01-Jun-2010 Derek Sollenberger <djsollen@google.com> eoving Zoom animation logic from WebView into ZoomManager. This is
pick bad5ede Revert "Refactor the on-screen zoom controls into a separate class."

one part of a series of CL's that is intended to refactor all zoom
logic into the ZoomManager.

Change-Id: I6260c7d2daade4861df1296c9db364ee2a892bd0
http://b/2671604
/frameworks/base/core/java/android/webkit/ZoomManager.java
03e489157191a7bda903babe9437076bf135bc41 18-May-2010 Derek Sollenberger <djsollen@google.com> Refactoring more webview zoom code into ZoomManager.

This CL is #2 of multiple CL's to remove the zoom code
from webview and place it into webkit.ZoomManager. Each
commit is only part of the entire refactoring so there
are many ZoomManager.* variables still referenced from
WebView.

Change-Id: I21f6517dff46b65a277bc67120ffabe043098e5e
http://b/2671604
/frameworks/base/core/java/android/webkit/ZoomManager.java
90b6e4879304c6ac8240cdeb9a4aea94a27cda58 10-May-2010 Derek Sollenberger <djsollen@google.com> Refactor the on-screen zoom controls into a separate class.

This CL is the first in a series of CL's that will extract the
zoom code from WebView and put it into ZoomManager. This initial
CL only extracts the on-screen zoom controls and required variables
into the ZoomManager. Since the on-screen controls are well defined
I put them into their own class called ZoomControls.

All of WebView's zoom interactions are handled by the ZoomManager.
The ZoomManager can then handle the request internally or as in the
case of on-screen controls pass the request to another class.

Change-Id: Icfc91ed0456c88d633249c26b9afc7dd216f75a1
http://b/2671604
/frameworks/base/core/java/android/webkit/ZoomManager.java