Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Decouple SysUI blurs from cross window blur API" into sc-dev

Browse Source
This commit is contained in:
Lucas Dupin
2021-06-26 01:40:34 +00:00
committed by Android (Google) Code Review
parent a6d89f27f7 711cb5bacd
commit fe4475a683
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/shared/src/com/android/systemui/shared/system/BlurUtils.java
View File

@@ -19,6 +19,7 @@ package com.android.systemui.shared.system;
import static android.view.CrossWindowBlurListeners.CROSS_WINDOW_BLUR_SUPPORTED; import static android.view.CrossWindowBlurListeners.CROSS_WINDOW_BLUR_SUPPORTED;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.os.SystemProperties;
public abstract class BlurUtils { public abstract class BlurUtils {
@@ -28,6 +29,7 @@ public abstract class BlurUtils {
* @return {@code true} when supported. * @return {@code true} when supported.
*/ */
public static boolean supportsBlursOnWindows() { public static boolean supportsBlursOnWindows() {
return CROSS_WINDOW_BLUR_SUPPORTED && ActivityManager.isHighEndGfx(); return CROSS_WINDOW_BLUR_SUPPORTED && ActivityManager.isHighEndGfx()
&& !SystemProperties.getBoolean("persist.sysui.disableBlur", false);
} }
} }

4
packages/SystemUI/src/com/android/systemui/statusbar/BlurUtils.kt
View File

@@ -20,6 +20,7 @@ import android.view.CrossWindowBlurListeners.CROSS_WINDOW_BLUR_SUPPORTED
import android.app.ActivityManager import android.app.ActivityManager
import android.content.res.Resources import android.content.res.Resources
import android.os.SystemProperties
import android.util.IndentingPrintWriter import android.util.IndentingPrintWriter
import android.util.MathUtils import android.util.MathUtils
import android.view.CrossWindowBlurListeners import android.view.CrossWindowBlurListeners
@@ -100,7 +101,8 @@ open class BlurUtils @Inject constructor(
*/ */
open fun supportsBlursOnWindows(): Boolean { open fun supportsBlursOnWindows(): Boolean {
return CROSS_WINDOW_BLUR_SUPPORTED && ActivityManager.isHighEndGfx() && 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<out String>) { override fun dump(fd: FileDescriptor, pw: PrintWriter, args: Array<out String>) {