Merge "Fix RenderEffect getting applied during swipe up to bouncer" into main (8a1c9984) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -229,7 +229,7 @@ public final class NotificationPanelViewController implements
		ShadeSurface, Dumpable, BrightnessMirrorShowingInteractor {

		public static final String TAG = NotificationPanelView.class.getSimpleName();
		private static final boolean DEBUG_LOGCAT = Compile.IS_DEBUG && Log.isLoggable(TAG, Log.DEBUG);
		private static final boolean DEBUG_LOGCAT = Compile.IS_DEBUG \|\| Log.isLoggable(TAG, Log.DEBUG);
		private static final boolean DEBUG_DRAWABLE = false;
		/** The parallax amount of the quick settings translation when dragging down the panel. */
		public static final float QS_PARALLAX_AMOUNT = 0.175f;
		@@ -988,7 +988,7 @@ public final class NotificationPanelViewController implements

		private void handleBouncerShowingChanged(Boolean isBouncerShowing) {
		if (!com.android.systemui.Flags.bouncerUiRevamp()) return;
		if (isBouncerShowing && isExpanded()) {
		if (isBouncerShowing && mStatusBarStateController.getState() != KEYGUARD) {
		if (mBlurRenderEffect == null) {
		mBlurRenderEffect = RenderEffect.createBlurEffect(
		mBlurConfig.getMaxBlurRadiusPx(),
		@@ -996,9 +996,12 @@ public final class NotificationPanelViewController implements
		Shader.TileMode.CLAMP);
		}
		debugLog("Applying blur RenderEffect to shade.");
		Trace.asyncTraceForTrackBegin(Trace.TRACE_TAG_APP, "ShadeBlurRenderEffect", "active",
		0);
		mView.setRenderEffect(mBlurRenderEffect);
		} else {
		debugLog("Resetting blur RenderEffect on shade.");
		Trace.asyncTraceForTrackEnd(Trace.TRACE_TAG_APP, "ShadeBlurRenderEffect", 0);
		mView.setRenderEffect(null);
		}
		}