drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make textZoom public"

Browse Source
This commit is contained in:
John Reck
2011-06-17 13:05:56 -07:00
committed by Android (Google) Code Review
parent d3cdbf0a4f caeb120170
commit 79e16da930
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/current.txt
View File

@ -23719,7 +23719,8 @@ package android.webkit {
method public boolean getSavePassword();
method public synchronized java.lang.String getSerifFontFamily();
method public synchronized java.lang.String getStandardFontFamily();
method public synchronized android.webkit.WebSettings.TextSize getTextSize();
method public deprecated synchronized android.webkit.WebSettings.TextSize getTextSize();
method public synchronized int getTextZoom();
method public deprecated synchronized boolean getUseDoubleTree();
method public deprecated boolean getUseWebViewBackgroundForOverscrollBackground();
method public synchronized boolean getUseWideViewPort();
@ -23769,7 +23770,8 @@ package android.webkit {
method public synchronized void setStandardFontFamily(java.lang.String);
method public synchronized void setSupportMultipleWindows(boolean);
method public void setSupportZoom(boolean);
method public synchronized void setTextSize(android.webkit.WebSettings.TextSize);
method public deprecated synchronized void setTextSize(android.webkit.WebSettings.TextSize);
method public synchronized void setTextZoom(int);
method public deprecated synchronized void setUseDoubleTree(boolean);
method public deprecated void setUseWebViewBackgroundForOverscrollBackground(boolean);
method public synchronized void setUseWideViewPort(boolean);
@ -23808,7 +23810,7 @@ package android.webkit {
enum_constant public static final android.webkit.WebSettings.RenderPriority NORMAL;
}
public static final class WebSettings.TextSize extends java.lang.Enum {
public static final deprecated class WebSettings.TextSize extends java.lang.Enum {
method public static android.webkit.WebSettings.TextSize valueOf(java.lang.String);
method public static final android.webkit.WebSettings.TextSize[] values();
enum_constant public static final android.webkit.WebSettings.TextSize LARGER;

9
core/java/android/webkit/WebSettings.java
View File

@ -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;