diff options
| author | Martin Kosiba <mkosiba@google.com> | 2013-09-24 09:49:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-24 09:49:22 +0000 |
| commit | 4e31b8046da047d5286532776d6d169e09d21ce5 (patch) | |
| tree | f797e2ab65dc23e9c66d427d97652059788f7d50 /core/java/android/webkit/WebView.java | |
| parent | 0d9fdc245172bb5c46eb21094e384d95da1a46df (diff) | |
| parent | 0d147d9b897c6a5bec867d7443df31138f51c7e5 (diff) | |
| download | frameworks_base-4e31b8046da047d5286532776d6d169e09d21ce5.zip frameworks_base-4e31b8046da047d5286532776d6d169e09d21ce5.tar.gz frameworks_base-4e31b8046da047d5286532776d6d169e09d21ce5.tar.bz2 | |
Merge "Update WebView documentation section about zoom." into klp-dev
Diffstat (limited to 'core/java/android/webkit/WebView.java')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index db11529..90cc72e 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -58,9 +58,6 @@ import java.util.Map; * It uses the WebKit rendering engine to display * web pages and includes methods to navigate forward and backward * through a history, zoom in and out, perform text searches and more.</p> - * <p>To enable the built-in zoom, set - * {@link #getSettings() WebSettings}.{@link WebSettings#setBuiltInZoomControls(boolean)} - * (introduced in API level {@link android.os.Build.VERSION_CODES#CUPCAKE}). * <p>Note that, in order for your Activity to access the Internet and load web pages * in a WebView, you must add the {@code INTERNET} permissions to your * Android Manifest file:</p> @@ -161,9 +158,18 @@ import java.util.Map; * } * }); * - * webview.loadUrl("http://slashdot.org/"); + * webview.loadUrl("http://developer.android.com/"); * </pre> * + * <h3>Zoom</h3> + * + * <p>To enable the built-in zoom, set + * {@link #getSettings() WebSettings}.{@link WebSettings#setBuiltInZoomControls(boolean)} + * (introduced in API level {@link android.os.Build.VERSION_CODES#CUPCAKE}).</p> + * <p>NOTE: Using zoom if either the height or width is set to + * {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT} may lead to undefined behavior + * and should be avoided.</p> + * * <h3>Cookie and window management</h3> * * <p>For obvious security reasons, your application has its own @@ -222,6 +228,7 @@ import java.util.Map; * <p>The {@code hdpi.css} stylesheet is only used for devices with a screen pixel ration of 1.5, * which is the high density pixel ratio.</p> * </li> + * </ul> * * <h3>HTML5 Video support</h3> * |