Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1

Browse Source
This commit is contained in:
Mangesh Ghiware
2011-11-16 18:01:35 -08:00
committed by Android (Google) Code Review
parent e5febfd5bd e832b63c97
commit 4fdfdeedc6
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/webkit/WebSettings.java
View File

@@ -799,7 +799,7 @@ public class WebSettings {
public void setDefaultZoom(ZoomDensity zoom) { public void setDefaultZoom(ZoomDensity zoom) {
if (mDefaultZoom != zoom) { if (mDefaultZoom != zoom) {
mDefaultZoom = zoom; mDefaultZoom = zoom;
mWebView.updateDefaultZoomDensity(zoom.value); mWebView.adjustDefaultZoomDensity(zoom.value);
} }
} }

10
core/java/android/webkit/WebView.java
View File

@@ -1341,9 +1341,13 @@ public class WebView extends AbsoluteLayout
} }
} }
/* package */void updateDefaultZoomDensity(int zoomDensity) { /* package */ void adjustDefaultZoomDensity(int zoomDensity) {
final float density = mContext.getResources().getDisplayMetrics().density final float density = mContext.getResources().getDisplayMetrics().density
* 100 / zoomDensity; * 100 / zoomDensity;
updateDefaultZoomDensity(density);
}
/* package */ void updateDefaultZoomDensity(float density) {
mNavSlop = (int) (16 * density); mNavSlop = (int) (16 * density);
mZoomManager.updateDefaultZoomDensity(density); mZoomManager.updateDefaultZoomDensity(density);
} }
@@ -2469,7 +2473,9 @@ public class WebView extends AbsoluteLayout
* Set the initial scale for the WebView. 0 means default. If * Set the initial scale for the WebView. 0 means default. If
* {@link WebSettings#getUseWideViewPort()} is true, it zooms out all the * {@link WebSettings#getUseWideViewPort()} is true, it zooms out all the
* way. Otherwise it starts with 100%. If initial scale is greater than 0, * way. Otherwise it starts with 100%. If initial scale is greater than 0,
* WebView starts will this value as initial scale. * WebView starts with this value as initial scale.
* Please note that unlike the scale properties in the viewport meta tag,
* this method doesn't take the screen density into account.
* *
* @param scaleInPercent The initial scale in percent. * @param scaleInPercent The initial scale in percent.
*/ */

5
core/java/android/webkit/WebViewCore.java
View File

@@ -2336,6 +2336,9 @@ public final class WebViewCore {
adjust = (float) mContext.getResources().getDisplayMetrics().densityDpi adjust = (float) mContext.getResources().getDisplayMetrics().densityDpi
/ mViewportDensityDpi; / mViewportDensityDpi;
} }
if (adjust != mWebView.getDefaultZoomScale()) {
mWebView.updateDefaultZoomDensity(adjust);
}
int defaultScale = (int) (adjust * 100); int defaultScale = (int) (adjust * 100);
if (mViewportInitialScale > 0) { if (mViewportInitialScale > 0) {
@@ -2546,7 +2549,7 @@ public final class WebViewCore {
// called by JNI // called by JNI
private void restoreScale(float scale, float textWrapScale) { private void restoreScale(float scale, float textWrapScale) {
if (mBrowserFrame.firstLayoutDone() == false) { if (mBrowserFrame.firstLayoutDone() == false) {
mIsRestored = scale > 0; mIsRestored = true;
mRestoredScale = scale; mRestoredScale = scale;
if (mSettings.getUseWideViewPort()) { if (mSettings.getUseWideViewPort()) {
mRestoredTextWrapScale = textWrapScale; mRestoredTextWrapScale = textWrapScale;

2
core/java/android/webkit/ZoomManager.java
View File

@@ -349,7 +349,7 @@ class ZoomManager {
} }
public final void setInitialScaleInPercent(int scaleInPercent) { public final void setInitialScaleInPercent(int scaleInPercent) {
mInitialScale = scaleInPercent * mDisplayDensity * 0.01f; mInitialScale = scaleInPercent * 0.01f;
} }
public final float computeScaleWithLimits(float scale) { public final float computeScaleWithLimits(float scale) {