Merge "Remove occurances of disable blurs sysprop" into sc-dev (e5c0addd) · Commits · e / os / android_frameworks_base

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

+3 −7

Original line number	Original line	Diff line number	Diff line
	@@ -16,22 +16,18 @@

	package com.android.systemui.shared.system;		package com.android.systemui.shared.system;

			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 {

	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.		* If this device can render blurs.
	*		*
	* @return {@code true} when supported.		* @return {@code true} when supported.
	*/		*/
	public static boolean supportsBlursOnWindows() {		public static boolean supportsBlursOnWindows() {
	return mBlurSupportedSysProp && !mBlurDisabledSysProp && ActivityManager.isHighEndGfx();		return CROSS_WINDOW_BLUR_SUPPORTED && ActivityManager.isHighEndGfx();
	}		}
	}		}

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

+4 −9

Original line number	Original line	Diff line number	Diff line
	@@ -16,9 +16,10 @@

	package com.android.systemui.statusbar		package com.android.systemui.statusbar

			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.SurfaceControl		import android.view.SurfaceControl
	@@ -40,10 +41,6 @@ open class BlurUtils @Inject constructor(
	) : Dumpable {		) : Dumpable {
	val minBlurRadius = resources.getDimensionPixelSize(R.dimen.min_window_blur_radius)		val minBlurRadius = resources.getDimensionPixelSize(R.dimen.min_window_blur_radius)
	val maxBlurRadius = resources.getDimensionPixelSize(R.dimen.max_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 {		init {
	dumpManager.registerDumpable(javaClass.name, this)		dumpManager.registerDumpable(javaClass.name, this)
	@@ -100,7 +97,7 @@ open class BlurUtils @Inject constructor(
	* @return {@code true} when supported.		* @return {@code true} when supported.
	*/		*/
	open fun supportsBlursOnWindows(): Boolean {		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<out String>) {		override fun dump(fd: FileDescriptor, pw: PrintWriter, args: Array<out String>) {
	@@ -109,8 +106,6 @@ open class BlurUtils @Inject constructor(
	it.increaseIndent()		it.increaseIndent()
	it.println("minBlurRadius: $minBlurRadius")		it.println("minBlurRadius: $minBlurRadius")
	it.println("maxBlurRadius: $maxBlurRadius")		it.println("maxBlurRadius: $maxBlurRadius")
	it.println("blurSupportedSysProp: $blurSupportedSysProp")
	it.println("blurDisabledSysProp: $blurDisabledSysProp")
	it.println("supportsBlursOnWindows: ${supportsBlursOnWindows()}")		it.println("supportsBlursOnWindows: ${supportsBlursOnWindows()}")
	}		}
	}		}