Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef3c3020 authored by Torne (Richard Coles)'s avatar Torne (Richard Coles) Committed by android-build-merger
Browse files

Merge "WebView: note deprecation of onscreen zoom controls." into qt-dev am:... 

Merge "WebView: note deprecation of onscreen zoom controls." into qt-dev am: b0bcbb0c am: 016ee677 am: 30c60797
am: a9395a3a

Change-Id: If96046f0446e0f3f05ec605ce3cd33759401b19a
parents fc6eb1c9 a9395a3a

core/java/android/webkit/WebSettings.java

+6 −1
Original line number Diff line number Diff line
@@ -328,6 +328,9 @@ public abstract class WebSettings { 
     * <p>

     * The built-in mechanisms are the only currently supported zoom

     * mechanisms, so it is recommended that this setting is always enabled.

     * However, on-screen zoom controls are deprecated in Android (see

     * {@link android.widget.ZoomButtonsController}) so it's recommended to

     * disable {@link #setDisplayZoomControls}.

     *

     * @param enabled whether the WebView should use its built-in zoom mechanisms

     */
@@ -347,7 +350,9 @@ public abstract class WebSettings { 
    /**

     * Sets whether the WebView should display on-screen zoom controls when

     * using the built-in zoom mechanisms. See {@link #setBuiltInZoomControls}.

     * The default is {@code true}.

     * The default is {@code true}. However, on-screen zoom controls are deprecated

     * in Android (see {@link android.widget.ZoomButtonsController}) so it's

     * recommended to set this to {@code false}.

     *

     * @param enabled whether the WebView should display on-screen zoom controls

     */