diff options
author | Mikhail Naganov <mnaganov@google.com> | 2012-08-07 18:26:52 +0100 |
---|---|---|
committer | Selim Gurun <sgurun@google.com> | 2012-08-21 15:52:40 -0700 |
commit | 9d5e7aa38d5945b98aa9e193a37242cc1db35422 (patch) | |
tree | 7d445fc0e7ac19b13201e2d1477f5d263d278c39 /core/java/android/webkit/WebSettings.java | |
parent | df5c3a54c7e955fb89951b63ff49f275a53f9c35 (diff) | |
download | frameworks_base-9d5e7aa38d5945b98aa9e193a37242cc1db35422.zip frameworks_base-9d5e7aa38d5945b98aa9e193a37242cc1db35422.tar.gz frameworks_base-9d5e7aa38d5945b98aa9e193a37242cc1db35422.tar.bz2 |
Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE
TextSize is deprecated, so we wouldn't expect from WebViewProvider
implementations to re-implement it in some other way than Android WebView does
it. This also makes recently added TextSize.getValue method redundant.
Clean cherry pick: 1202d66f78fb24850b997e37f0ce3cb3b36e4bbf
Change-Id: Ib6aecb187f10ac3ec5d12cb839cb814ec0c564fe
Diffstat (limited to 'core/java/android/webkit/WebSettings.java')
-rw-r--r-- | core/java/android/webkit/WebSettings.java | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 074f910..02c144f 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -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; } /** |