Merge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE" into jb-mr1-dev (b62999c1) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebSettings.java

+16 −3

Original line number	Diff line number	Diff line
		@@ -423,7 +423,7 @@ public abstract class WebSettings {
		* Gets the text zoom of the page in percent.
		*
		* @return the text zoom of the page in percent
		* @see #setTextSizeZoom
		* @see #setTextZoom
		*/
		public synchronized int getTextZoom() {
		throw new MustOverrideException();
		@@ -436,7 +436,7 @@ public abstract class WebSettings {
		* @deprecated Use {@link #setTextZoom} instead.
		*/
		public synchronized void setTextSize(TextSize t) {
		throw new MustOverrideException();
		setTextZoom(t.value);
		}

		/**
		@@ -449,7 +449,20 @@ public abstract class WebSettings {
		* @deprecated Use {@link #getTextZoom} instead.
		*/
		public synchronized TextSize getTextSize() {
		throw new MustOverrideException();
		TextSize closestSize = null;
		int smallestDelta = Integer.MAX_VALUE;
		int textSize = getTextZoom();
		for (TextSize size : TextSize.values()) {
		int delta = Math.abs(textSize - size.value);
		if (delta == 0) {
		return size;
		}
		if (delta < smallestDelta) {
		smallestDelta = delta;
		closestSize = size;
		}
		}
		return closestSize != null ? closestSize : TextSize.NORMAL;
		}

		/**

+0 −28

Original line number	Diff line number	Diff line
		@@ -664,34 +664,6 @@ public class WebSettingsClassic extends WebSettings {
		return mTextSize;
		}

		/**
		* @see android.webkit.WebSettings#setTextSize(android.webkit.WebSettingsClassic.TextSize)
		*/
		@Override
		public synchronized void setTextSize(TextSize t) {
		setTextZoom(t.value);
		}

		/**
		* @see android.webkit.WebSettings#getTextSize()
		*/
		@Override
		public synchronized TextSize getTextSize() {
		TextSize closestSize = null;
		int smallestDelta = Integer.MAX_VALUE;
		for (TextSize size : TextSize.values()) {
		int delta = Math.abs(mTextSize - size.value);
		if (delta == 0) {
		return size;
		}
		if (delta < smallestDelta) {
		smallestDelta = delta;
		closestSize = size;
		}
		}
		return closestSize != null ? closestSize : TextSize.NORMAL;
		}

		/**
		* Set the double-tap zoom of the page in percent. Default is 100.
		* @param doubleTapZoom A percent value for increasing or decreasing the double-tap zoom.