Merge "Remove flag disable_blurred_shade_visible" into main (7b7ea0fd) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -1518,16 +1518,6 @@ flag {
		bug: "376491880"
		}

		flag {
		name: "disable_blurred_shade_visible"
		namespace: "systemui"
		description: "Removes the check for a blur radius when determining shade window visibility"
		bug: "394977231"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "notification_shade_blur"
		namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ import android.content.res.Configuration;
		import android.graphics.Rect;
		import android.platform.test.annotations.DisableFlags;
		import android.platform.test.annotations.EnableFlags;
		import android.platform.test.annotations.RequiresFlagsDisabled;
		import android.platform.test.flag.junit.CheckFlagsRule;
		import android.platform.test.flag.junit.DeviceFlagsValueProvider;
		import android.platform.test.flag.junit.FlagsParameterization;
		@@ -54,7 +53,6 @@ import android.view.WindowManager;
		import androidx.test.filters.SmallTest;

		import com.android.internal.colorextraction.ColorExtractor;
		import com.android.systemui.Flags;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.biometrics.AuthController;
		import com.android.systemui.colorextraction.SysuiColorExtractor;
		@@ -276,16 +274,6 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase {
		assertThat((mLayoutParameters.getValue().flags & FLAG_SHOW_WALLPAPER) != 0).isTrue();
		}

		@Test
		@RequiresFlagsDisabled(Flags.FLAG_DISABLE_BLURRED_SHADE_VISIBLE)
		public void setBackgroundBlurRadius_expandedWithBlurs() {
		mNotificationShadeWindowController.setBackgroundBlurRadius(10);
		verify(mNotificationShadeWindowView).setVisibility(eq(View.VISIBLE));

		mNotificationShadeWindowController.setBackgroundBlurRadius(0);
		verify(mNotificationShadeWindowView).setVisibility(eq(View.INVISIBLE));
		}

		@Test
		public void setBouncerShowing_isFocusable_whenNeedsInput() {
		mNotificationShadeWindowController.setKeyguardNeedsInput(true);

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

+1 −7

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@ import android.window.WindowContext;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.systemui.Dumpable;
		import com.android.systemui.Flags;
		import com.android.systemui.biometrics.AuthController;
		import com.android.systemui.colorextraction.SysuiColorExtractor;
		import com.android.systemui.communal.domain.interactor.CommunalInteractor;
		@@ -546,21 +545,16 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
		}

		private boolean isExpanded(NotificationShadeWindowState state) {
		boolean visForBlur = state.backgroundBlurRadius > 0;
		if (Flags.bouncerUiRevamp() \|\| Flags.disableBlurredShadeVisible()) {
		visForBlur = false;
		}
		boolean isExpanded = !state.forceWindowCollapsed && (state.isKeyguardShowingAndNotOccluded()
		\|\| state.panelVisible \|\| state.keyguardFadingAway \|\| state.bouncerShowing
		\|\| state.headsUpNotificationShowing
		\|\| state.scrimsVisibility != ScrimController.TRANSPARENT)
		\|\| visForBlur
		\|\| state.launchingActivityFromNotification;
		mLogger.logIsExpanded(isExpanded, state.forceWindowCollapsed,
		state.isKeyguardShowingAndNotOccluded(), state.panelVisible,
		state.keyguardFadingAway, state.bouncerShowing, state.headsUpNotificationShowing,
		state.scrimsVisibility != ScrimController.TRANSPARENT,
		visForBlur, state.launchingActivityFromNotification);
		state.launchingActivityFromNotification);
		return isExpanded;
		}

packages/SystemUI/src/com/android/systemui/shade/ShadeWindowLogger.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@ class ShadeWindowLogger @Inject constructor(@ShadeWindowLog private val buffer:
		bouncerShowing: Boolean,
		headsUpNotificationShowing: Boolean,
		scrimsVisibilityNotTransparent: Boolean,
		backgroundBlurRadius: Boolean,
		launchingActivityFromNotification: Boolean,
		) {
		buffer.log(
		@@ -75,7 +74,6 @@ class ShadeWindowLogger @Inject constructor(@ShadeWindowLog private val buffer:
		int1 = if (bouncerShowing) 1 else 0
		int2 = if (headsUpNotificationShowing) 1 else 0
		long1 = if (scrimsVisibilityNotTransparent) 1 else 0
		long2 = if (backgroundBlurRadius) 1 else 0
		double1 = if (launchingActivityFromNotification) 1.0 else 0.0
		},
		{