summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Bai <michaelbai@google.com> 2022-01-27 19:30:50 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-01-27 19:30:50 +0000
commit5c0a8f516977b76d8e7099fa03dbba6232fd3864 (patch)
treefd33d2ae61de63361f2dc9ff5399ed31d38e5a04
parent4266470bbb109c7230fec7ec543e7ec1f6265eab (diff)
parent62c1923abf15f339ad5cb0ac4d2b7ee77f7076d1 (diff)
Merge "WebView: Rename to set/isAlgorithmicDarkeningAllowed"
-rw-r--r--core/api/current.txt4
-rw-r--r--core/java/android/webkit/WebSettings.java10
2 files changed, 7 insertions, 7 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index e1d05be57847..5fe379866f98 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -54297,7 +54297,6 @@ package android.webkit {
public abstract class WebSettings {
ctor public WebSettings();
method @Deprecated public abstract boolean enableSmoothTransition();
- method public boolean getAllowAlgorithmicDarkening();
method public abstract boolean getAllowContentAccess();
method public abstract boolean getAllowFileAccess();
method public abstract boolean getAllowFileAccessFromFileURLs();
@@ -54342,7 +54341,8 @@ package android.webkit {
method public abstract int getTextZoom();
method public abstract boolean getUseWideViewPort();
method public abstract String getUserAgentString();
- method public void setAllowAlgorithmicDarkening(boolean);
+ method public boolean isAlgorithmicDarkeningAllowed();
+ method public void setAlgorithmicDarkeningAllowed(boolean);
method public abstract void setAllowContentAccess(boolean);
method public abstract void setAllowFileAccess(boolean);
method @Deprecated public abstract void setAllowFileAccessFromFileURLs(boolean);
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index f14c25140d10..280e7dfeac9a 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -141,7 +141,7 @@ public abstract class WebSettings {
* and WebView to attempt to darken web content by algorithmic darkening when
* appropriate.
*
- * Refer to {@link #setAllowAlgorithmicDarkening} for detail.
+ * Refer to {@link #setAlgorithmicDarkeningAllowed} for detail.
*
* @hide
*/
@@ -1558,7 +1558,7 @@ public abstract class WebSettings {
* {@code targetSdkVersion} &ge; {@link android.os.Build.VERSION_CODES#TIRAMISU}
* this API is a no-op and WebView will always use the dark style defined by web content
* authors if the app's theme is dark. To customize the behavior, refer to
- * {@link #setAllowAlgorithmicDarkening}.
+ * {@link #setAlgorithmicDarkeningAllowed}.
*/
public void setForceDark(@ForceDark int forceDark) {
// Stub implementation to satisfy Roboelectrc shadows that don't override this yet.
@@ -1604,7 +1604,7 @@ public abstract class WebSettings {
*
* @param allow allow algorithmic darkening or not.
*/
- public void setAllowAlgorithmicDarkening(boolean allow) {
+ public void setAlgorithmicDarkeningAllowed(boolean allow) {
// Stub implementation to satisfy Roboelectrc shadows that don't override this yet.
}
@@ -1613,9 +1613,9 @@ public abstract class WebSettings {
* The default is false.
*
* @return if the algorithmic darkening is allowed or not.
- * @see #setAllowAlgorithmicDarkening
+ * @see #setAlgorithmicDarkeningAllowed
*/
- public boolean getAllowAlgorithmicDarkening() {
+ public boolean isAlgorithmicDarkeningAllowed() {
// Stub implementation to satisfy Roboelectrc shadows that don't override this yet.
return false;
}