diff options
| author | Mikhail Naganov <mnaganov@google.com> | 2013-06-03 08:39:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-03 08:39:44 +0000 |
| commit | d18607980d86f03ffd838321ac3d511fa820b3e0 (patch) | |
| tree | b81a08f0db7af1a2145a86600f0ca7ec4a94eea9 | |
| parent | 156cf401482c6274b419bf25255ba9bac35adf3f (diff) | |
| parent | 8887b2b4f1be5d45c47ad3accf3e0685056c742e (diff) | |
| download | frameworks_base-d18607980d86f03ffd838321ac3d511fa820b3e0.zip frameworks_base-d18607980d86f03ffd838321ac3d511fa820b3e0.tar.gz frameworks_base-d18607980d86f03ffd838321ac3d511fa820b3e0.tar.bz2 | |
Merge "Specify that WebSettings.{get|set}DefaultZoom are not recommented to use"
| -rw-r--r-- | core/java/android/webkit/WebSettings.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 8ae0021..19492c2 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -500,6 +500,12 @@ public abstract class WebSettings { * Sets the default zoom density of the page. This must be called from the UI * thread. The default is {@link ZoomDensity#MEDIUM}. * + * This setting is not recommended for use in new applications. If the WebView + * is utilized to display mobile-oriented pages, the desired effect can be achieved by + * adjusting 'width' and 'initial-scale' attributes of page's 'meta viewport' + * tag. For pages lacking the tag, {@link android.webkit.WebView#setInitialScale} + * and {@link #setUseWideViewPort} can be used. + * * @param zoom the zoom density */ public void setDefaultZoom(ZoomDensity zoom) { @@ -510,6 +516,8 @@ public abstract class WebSettings { * Gets the default zoom density of the page. This should be called from * the UI thread. * + * This setting is not recommended for use in new applications. + * * @return the zoom density * @see #setDefaultZoom */ |