Merge "Use global setting instead of forceWindowBlurDisabled" into sc-dev (57ef7202) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -2102,6 +2102,7 @@ package android.provider {
		field public static final String AUTOMATIC_POWER_SAVE_MODE = "automatic_power_save_mode";
		field public static final String BATTERY_SAVER_CONSTANTS = "battery_saver_constants";
		field public static final String DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW = "enable_non_resizable_multi_window";
		field public static final String DISABLE_WINDOW_BLURS = "disable_window_blurs";
		field public static final String DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD = "dynamic_power_savings_disable_threshold";
		field public static final String DYNAMIC_POWER_SAVINGS_ENABLED = "dynamic_power_savings_enabled";
		field public static final String HIDDEN_API_BLACKLIST_EXEMPTIONS = "hidden_api_blacklist_exemptions";
		@@ -2779,7 +2780,6 @@ package android.view {
		method public default void holdLock(android.os.IBinder, int);
		method public default boolean isTaskSnapshotSupported();
		method public default void setDisplayImePolicy(int, int);
		method public default void setForceCrossWindowBlurDisabled(boolean);
		method public default void setShouldShowSystemDecors(int, boolean);
		method public default void setShouldShowWithInsecureKeyguard(int, boolean);
		method public default boolean shouldShowSystemDecors(int);

+14 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,7 @@ import android.util.ArraySet;
		import android.util.Log;
		import android.util.MemoryIntArray;
		import android.view.Display;
		import android.view.Window;
		import android.view.WindowManager.LayoutParams;

		import com.android.internal.annotations.GuardedBy;
		@@ -13371,6 +13372,19 @@ public final class Settings {
		@Readable
		public static final String WINDOW_ANIMATION_SCALE = "window_animation_scale";

		/**
		* Setting to disable cross-window blurs. This includes window blur behind, (see
		* {@link LayoutParams#setBlurBehindRadius}) and window background blur (see
		* {@link Window#setBackgroundBlurRadius}).
		*
		* The value is a boolean (1 or 0).
		* @hide
		*/
		@TestApi
		@Readable
		@SuppressLint("NoSettingsProvider")
		public static final String DISABLE_WINDOW_BLURS = "disable_window_blurs";

		/**
		* Scaling factor for activity transition animations.
		*

+0 −2

Original line number	Diff line number	Diff line
		@@ -857,7 +857,5 @@ interface IWindowManager
		*/
		void unregisterCrossWindowBlurEnabledListener(ICrossWindowBlurEnabledListener listener);

		void setForceCrossWindowBlurDisabled(boolean disable);

		boolean isTaskSnapshotSupported();
		}

+0 −14

Original line number	Diff line number	Diff line
		@@ -907,20 +907,6 @@ public interface WindowManager extends ViewManager {
		default void removeCrossWindowBlurEnabledListener(@NonNull Consumer<Boolean> listener) {
		}

		/**
		* Disables cross-window blurs device-wide. This includes window blur behind
		* (see {@link LayoutParams#setBlurBehindRadius}) and window background blur
		* (see {@link Window#setBackgroundBlurRadius}).
		*
		* @param disable specifies whether to disable the blur. Note that calling this
		* with 'disable=false' will not enable blurs if there is something
		* else disabling blurs.
		* @hide
		*/
		@TestApi
		default void setForceCrossWindowBlurDisabled(boolean disable) {
		}

		/**
		* @hide
		*/

+0 −9

Original line number	Diff line number	Diff line
		@@ -327,15 +327,6 @@ public final class WindowManagerImpl implements WindowManager {
		CrossWindowBlurListeners.getInstance().removeListener(listener);
		}

		@Override
		public void setForceCrossWindowBlurDisabled(boolean disable) {
		try {
		WindowManagerGlobal.getWindowManagerService()
		.setForceCrossWindowBlurDisabled(disable);
		} catch (RemoteException e) {
		}
		}

		@Override
		public boolean isTaskSnapshotSupported() {
		try {