diff options
3 files changed, 13 insertions, 10 deletions
diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig index 9dd49d6b1015..ab18612355f0 100644 --- a/packages/SystemUI/aconfig/systemui.aconfig +++ b/packages/SystemUI/aconfig/systemui.aconfig @@ -1846,23 +1846,23 @@ flag { } flag { - name: "notification_shade_blur" - namespace: "systemui" - description: "Enables the new blur effect on the Notification Shade." - bug: "370555223" -} - -flag { - name: "disable_shade_visible_with_blur" + name: "disable_blurred_shade_visible" namespace: "systemui" description: "Removes the check for a blur radius when determining shade window visibility" - bug: "356804470" + bug: "394977231" metadata { purpose: PURPOSE_BUGFIX } } flag { + name: "notification_shade_blur" + namespace: "systemui" + description: "Enables the new blur effect on the Notification Shade." + bug: "370555223" +} + +flag { name: "notification_row_transparency" namespace: "systemui" description: "Enables transparency on the Notification Shade." diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java index 4a304071ee97..268d62952fc7 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java @@ -40,6 +40,7 @@ import android.app.IActivityManager; import android.content.pm.ActivityInfo; import android.content.res.Configuration; import android.graphics.Rect; +import android.platform.test.annotations.RequiresFlagsDisabled; import android.platform.test.flag.junit.FlagsParameterization; import android.testing.TestableLooper.RunWithLooper; import android.view.View; @@ -49,6 +50,7 @@ import androidx.test.filters.SmallTest; import com.android.app.viewcapture.ViewCaptureAwareWindowManager; 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; @@ -265,6 +267,7 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase { } @Test + @RequiresFlagsDisabled(Flags.FLAG_DISABLE_BLURRED_SHADE_VISIBLE) public void setBackgroundBlurRadius_expandedWithBlurs() { mNotificationShadeWindowController.setBackgroundBlurRadius(10); verify(mNotificationShadeWindowView).setVisibility(eq(View.VISIBLE)); diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java index dafb1a559d59..8d7cc922c38b 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java @@ -498,7 +498,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW } private boolean isExpanded(NotificationShadeWindowState state) { - boolean visForBlur = !Flags.disableShadeVisibleWithBlur() && state.backgroundBlurRadius > 0; + boolean visForBlur = !Flags.disableBlurredShadeVisible() && state.backgroundBlurRadius > 0; boolean isExpanded = !state.forceWindowCollapsed && (state.isKeyguardShowingAndNotOccluded() || state.panelVisible || state.keyguardFadingAway || state.bouncerShowing || state.headsUpNotificationShowing |