Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87bfd135 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Decouple SysUI blurs from cross window blur API" into sc-dev am: fe4475a6 am: 55003306 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15113462

Change-Id: I1555134077a6086eb4e3f04da0ad81b8b25de782
parents de920661 55003306

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

+3 −1
Original line number Diff line number Diff line
@@ -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);

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/BlurUtils.kt

+3 −1
Original line number Diff line number Diff line
@@ -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<out String>) {