diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/BlurUtils.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/BlurUtils.java index 9f26d851f7752..59e1cb5db03ee 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/BlurUtils.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/BlurUtils.java @@ -16,22 +16,18 @@ package com.android.systemui.shared.system; +import static android.view.CrossWindowBlurListeners.CROSS_WINDOW_BLUR_SUPPORTED; + import android.app.ActivityManager; -import android.os.SystemProperties; public abstract class BlurUtils { - private static boolean mBlurSupportedSysProp = SystemProperties - .getBoolean("ro.surface_flinger.supports_background_blur", false); - private static boolean mBlurDisabledSysProp = SystemProperties - .getBoolean("persist.sys.sf.disable_blurs", false); - /** * If this device can render blurs. * * @return {@code true} when supported. */ public static boolean supportsBlursOnWindows() { - return mBlurSupportedSysProp && !mBlurDisabledSysProp && ActivityManager.isHighEndGfx(); + return CROSS_WINDOW_BLUR_SUPPORTED && ActivityManager.isHighEndGfx(); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BlurUtils.kt b/packages/SystemUI/src/com/android/systemui/statusbar/BlurUtils.kt index 969877d5349cd..071e9472a41ba 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BlurUtils.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BlurUtils.kt @@ -16,9 +16,10 @@ package com.android.systemui.statusbar +import android.view.CrossWindowBlurListeners.CROSS_WINDOW_BLUR_SUPPORTED + import android.app.ActivityManager import android.content.res.Resources -import android.os.SystemProperties import android.util.IndentingPrintWriter import android.util.MathUtils import android.view.SurfaceControl @@ -40,10 +41,6 @@ open class BlurUtils @Inject constructor( ) : Dumpable { val minBlurRadius = resources.getDimensionPixelSize(R.dimen.min_window_blur_radius) val maxBlurRadius = resources.getDimensionPixelSize(R.dimen.max_window_blur_radius) - private val blurSupportedSysProp = SystemProperties - .getBoolean("ro.surface_flinger.supports_background_blur", false) - private val blurDisabledSysProp = SystemProperties - .getBoolean("persist.sys.sf.disable_blurs", false) init { dumpManager.registerDumpable(javaClass.name, this) @@ -100,7 +97,7 @@ open class BlurUtils @Inject constructor( * @return {@code true} when supported. */ open fun supportsBlursOnWindows(): Boolean { - return blurSupportedSysProp && !blurDisabledSysProp && ActivityManager.isHighEndGfx() + return CROSS_WINDOW_BLUR_SUPPORTED && ActivityManager.isHighEndGfx() } override fun dump(fd: FileDescriptor, pw: PrintWriter, args: Array) { @@ -109,9 +106,7 @@ open class BlurUtils @Inject constructor( it.increaseIndent() it.println("minBlurRadius: $minBlurRadius") it.println("maxBlurRadius: $maxBlurRadius") - it.println("blurSupportedSysProp: $blurSupportedSysProp") - it.println("blurDisabledSysProp: $blurDisabledSysProp") it.println("supportsBlursOnWindows: ${supportsBlursOnWindows()}") } } -} \ No newline at end of file +}