Merge "WebView: Rename to set/isAlgorithmicDarkeningAllowed" (5c0a8f51) · Commits · e / os / android_frameworks_base

core/api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

core/java/android/webkit/WebSettings.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -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} ≥ {@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;
		}