drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update fix to restore view and text wrap scales." into ics-mr1

Browse Source
This commit is contained in:
Mangesh Ghiware
2011-11-03 15:35:23 -07:00
committed by Android (Google) Code Review
parent e0ad47465e e59e301ca0
commit 69957172fa
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2416,7 +2416,11 @@ public final class WebViewCore {
if (mIsRestored) {
mInitialViewState.mIsRestored = true;
mInitialViewState.mViewScale = mRestoredScale;
mInitialViewState.mTextWrapScale = mRestoredTextWrapScale;
if (mRestoredTextWrapScale > 0) {
mInitialViewState.mTextWrapScale = mRestoredTextWrapScale;
} else {
mInitialViewState.mTextWrapScale = mInitialViewState.mViewScale;
}
} else {
if (mViewportInitialScale > 0) {
mInitialViewState.mViewScale = mInitialViewState.mTextWrapScale =
@ -2535,9 +2539,11 @@ public final class WebViewCore {
// called by JNI
private void restoreScale(float scale, float textWrapScale) {
if (mBrowserFrame.firstLayoutDone() == false) {
mIsRestored = true;
mIsRestored = scale > 0;
mRestoredScale = scale;
mRestoredTextWrapScale = textWrapScale;
if (mSettings.getUseWideViewPort()) {
mRestoredTextWrapScale = textWrapScale;
}
}
}

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

@ -1114,7 +1114,7 @@ class ZoomManager {
float scale;
if (mInitialScale > 0) {
scale = mInitialScale;
} else if (viewState.mIsRestored) {
} else if (viewState.mIsRestored || viewState.mViewScale > 0) {
scale = (viewState.mViewScale > 0)
? viewState.mViewScale : overviewScale;
mTextWrapScale = (viewState.mTextWrapScale > 0)