Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 016ee6777e

Change-Id: Ibc89c85870f87d002f23aaa8fbbada0f3cd705ae
This commit is contained in:
Torne (Richard Coles)
2019-11-05 15:20:34 -08:00
committed by android-build-merger
parent fd9f262219 016ee6777e
commit 30c6079772
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -328,6 +328,9 @@ public abstract class WebSettings {
* <p> * <p>
* The built-in mechanisms are the only currently supported zoom * The built-in mechanisms are the only currently supported zoom
* mechanisms, so it is recommended that this setting is always enabled. * 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 * @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 * Sets whether the WebView should display on-screen zoom controls when
* using the built-in zoom mechanisms. See {@link #setBuiltInZoomControls}. * 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 * @param enabled whether the WebView should display on-screen zoom controls
*/ */