Merge "Add support for force-enabling zoom" (3bd92957) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebSettings.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -219,6 +219,7 @@ public class WebSettings {
		private boolean mAllowContentAccess = true;
		private boolean mLoadWithOverviewMode = false;
		private boolean mEnableSmoothTransition = false;
		private boolean mForceUserScalable = false;

		// AutoFill Profile data
		/**
		@@ -1658,6 +1659,23 @@ public class WebSettings {
		}
		}

		/**
		* Returns whether the viewport metatag can disable zooming
		* @hide
		*/
		public boolean forceUserScalable() {
		return mForceUserScalable;
		}

		/**
		* Sets whether viewport metatag can disable zooming.
		* @param flag Whether or not to forceably enable user scalable.
		* @hide
		*/
		public synchronized void setForceUserScalable(boolean flag) {
		mForceUserScalable = flag;
		}

		synchronized void setSyntheticLinksEnabled(boolean flag) {
		if (mSyntheticLinksEnabled != flag) {
		mSyntheticLinksEnabled = flag;

+25 −4

Original line number	Diff line number	Diff line
		@@ -2253,6 +2253,27 @@ final class WebViewCore {
		// set the viewport settings from WebKit
		setViewportSettingsFromNative();

		if (mSettings.forceUserScalable()) {
		mViewportUserScalable = true;
		if (mViewportInitialScale > 0) {
		if (mViewportMinimumScale > 0) {
		mViewportMinimumScale = Math.min(mViewportMinimumScale,
		mViewportInitialScale / 2);
		}
		if (mViewportMaximumScale > 0) {
		mViewportMaximumScale = Math.max(mViewportMaximumScale,
		mViewportInitialScale * 2);
		}
		} else {
		if (mViewportMinimumScale > 0) {
		mViewportMinimumScale = Math.min(mViewportMinimumScale, 50);
		}
		if (mViewportMaximumScale > 0) {
		mViewportMaximumScale = Math.max(mViewportMaximumScale, 200);
		}
		}
		}

		// adjust the default scale to match the densityDpi
		float adjust = 1.0f;
		if (mViewportDensityDpi == -1) {