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 59e1cb5db03ee..61b0e4d9024ff 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 @@ -19,6 +19,7 @@ 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 { @@ -28,6 +29,7 @@ public abstract class BlurUtils { * @return {@code true} when supported. */ public static boolean supportsBlursOnWindows() { - return CROSS_WINDOW_BLUR_SUPPORTED && ActivityManager.isHighEndGfx(); + return CROSS_WINDOW_BLUR_SUPPORTED && ActivityManager.isHighEndGfx() + && !SystemProperties.getBoolean("persist.sysui.disableBlur", false); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BlurUtils.kt b/packages/SystemUI/src/com/android/systemui/statusbar/BlurUtils.kt index 89dda9c52651e..aafeabc7c1a23 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BlurUtils.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BlurUtils.kt @@ -20,6 +20,7 @@ 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.CrossWindowBlurListeners @@ -100,7 +101,8 @@ open class BlurUtils @Inject constructor( */ open fun supportsBlursOnWindows(): Boolean { return CROSS_WINDOW_BLUR_SUPPORTED && ActivityManager.isHighEndGfx() && - crossWindowBlurListeners.isCrossWindowBlurEnabled() + crossWindowBlurListeners.isCrossWindowBlurEnabled() && + !SystemProperties.getBoolean("persist.sysui.disableBlur", false) } override fun dump(fd: FileDescriptor, pw: PrintWriter, args: Array) {