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

Merge "Prevent set mInitialScale being overridden by mDefaultScale."

Browse Source
This commit is contained in:
Shimeng (Simon) Wang
2011-07-08 16:48:23 -07:00
committed by Android (Google) Code Review
parent fcc8fae91e 1151fe78fc
commit e5f5e82027
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -300,7 +300,7 @@ class ZoomManager {
}
public final float getDefaultScale() {
return mDefaultScale;
return mInitialScale > 0 ? mInitialScale : mDefaultScale;
}
public final float getReadingLevelScale() {
@@ -1087,6 +1087,7 @@ class ZoomManager {
float scale;
if (mInitialScale > 0) {
scale = mInitialScale;
mTextWrapScale = scale;
} else if (viewState.mViewScale > 0) {
mTextWrapScale = viewState.mTextWrapScale;
scale = viewState.mViewScale;
@@ -1105,7 +1106,7 @@ class ZoomManager {
}
boolean reflowText = false;
if (!viewState.mIsRestored) {
if (settings.getUseFixedViewport()) {
if (settings.getUseFixedViewport() && mInitialScale == 0) {
// Override the scale only in case of fixed viewport.
scale = Math.max(scale, overviewScale);
mTextWrapScale = Math.max(mTextWrapScale, overviewScale);