Merge "Update fix to restore view and text wrap scales." into ics-mr1 (69957172) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebViewCore.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -2416,7 +2416,11 @@ public final class WebViewCore {
		if (mIsRestored) {
		mInitialViewState.mIsRestored = true;
		mInitialViewState.mViewScale = mRestoredScale;
		if (mRestoredTextWrapScale > 0) {
		mInitialViewState.mTextWrapScale = mRestoredTextWrapScale;
		} else {
		mInitialViewState.mTextWrapScale = mInitialViewState.mViewScale;
		}
		} else {
		if (mViewportInitialScale > 0) {
		mInitialViewState.mViewScale = mInitialViewState.mTextWrapScale =
		@@ -2535,11 +2539,13 @@ 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;
		if (mSettings.getUseWideViewPort()) {
		mRestoredTextWrapScale = textWrapScale;
		}
		}
		}

		// called by JNI
		private void needTouchEvents(boolean need) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)