diff options
author | John Reck <jreck@google.com> | 2011-06-17 13:05:56 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-17 13:05:56 -0700 |
commit | 79e16da930dee1b13c4fb6b88c0fbcc6c5b537e0 (patch) | |
tree | ca1ae8079894ba96b4f26b659ce340f3df182393 /core/java/android | |
parent | d3cdbf0a4f6be4b14c056badc11ebe88028afcd6 (diff) | |
parent | caeb120170477f52516cd9d12469c582e7dec8fe (diff) | |
download | frameworks_base-79e16da930dee1b13c4fb6b88c0fbcc6c5b537e0.zip frameworks_base-79e16da930dee1b13c4fb6b88c0fbcc6c5b537e0.tar.gz frameworks_base-79e16da930dee1b13c4fb6b88c0fbcc6c5b537e0.tar.bz2 |
Merge "Make textZoom public"
Diffstat (limited to 'core/java/android')
-rw-r--r-- | core/java/android/webkit/WebSettings.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 9802990..761007f 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -59,6 +59,7 @@ public class WebSettings { * NORMAL is 100% * LARGER is 150% * LARGEST is 200% + * @deprecated Use {@link WebSettings#setTextZoom(int)} and {@link WebSettings#getTextZoom()} instead. */ public enum TextSize { SMALLEST(50), @@ -711,7 +712,6 @@ public class WebSettings { /** * Set the text zoom of the page in percent. Default is 100. * @param textZoom A percent value for increasing or decreasing the text. - * @hide */ public synchronized void setTextZoom(int textZoom) { if (mTextSize != textZoom) { @@ -728,7 +728,6 @@ public class WebSettings { * Get the text zoom of the page in percent. * @return A percent value describing the text zoom. * @see setTextSizeZoom - * @hide */ public synchronized int getTextZoom() { return mTextSize; @@ -738,15 +737,19 @@ public class WebSettings { * Set the text size of the page. * @param t A TextSize value for increasing or decreasing the text. * @see WebSettings.TextSize + * @deprecated Use {@link #setTextZoom(int)} instead */ public synchronized void setTextSize(TextSize t) { setTextZoom(t.value); } /** - * Get the text size of the page. + * Get the text size of the page. If the text size was previously specified + * in percent using {@link #setTextZoom(int)}, this will return + * the closest matching {@link TextSize}. * @return A TextSize enum value describing the text size. * @see WebSettings.TextSize + * @deprecated Use {@link #getTextZoom()} instead */ public synchronized TextSize getTextSize() { TextSize closestSize = null; |