diff options
author | Mikhail Naganov <mnaganov@google.com> | 2013-01-08 01:50:37 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-08 01:51:02 -0800 |
commit | 2ede4226952770714df307803e49f2ffdbd81601 (patch) | |
tree | b9e986a8797e6a5842c4897af8f9ce7f6a94ec0b | |
parent | ef6550195f2f403e5ace27d49ae4f7f38d29cf4a (diff) | |
parent | cb000a68cb3c994c118345f091eaae19e011d21a (diff) | |
download | frameworks_base-2ede4226952770714df307803e49f2ffdbd81601.zip frameworks_base-2ede4226952770714df307803e49f2ffdbd81601.tar.gz frameworks_base-2ede4226952770714df307803e49f2ffdbd81601.tar.bz2 |
Merge "Update JavaDoc for WebSettings.{get|set}UseWideViewPort"
-rw-r--r-- | core/java/android/webkit/WebSettings.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 114ec42..728bcd3 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -594,18 +594,25 @@ public abstract class WebSettings { } /** - * Tells the WebView to use a wide viewport. The default is false. + * Sets whether the WebView should enable support for the "viewport" + * HTML meta tag or should use a wide viewport. + * When the value of the setting is false, the layout width is always set to the + * width of the WebView control in device-independent (CSS) pixels. + * When the value is true and the page contains the viewport meta tag, the value + * of the width specified in the tag is used. If the page does not contain the tag or + * does not provide a width, then a wide viewport will be used. * - * @param use whether to use a wide viewport + * @param use whether to enable support for the viewport meta tag */ public synchronized void setUseWideViewPort(boolean use) { throw new MustOverrideException(); } /** - * Gets whether the WebView is using a wide viewport. + * Gets whether the WebView supports the "viewport" + * HTML meta tag or will use a wide viewport. * - * @return true if the WebView is using a wide viewport + * @return true if the WebView supports the viewport meta tag * @see #setUseWideViewPort */ public synchronized boolean getUseWideViewPort() { |