From c7dc9ab8abd7a4a09710b38127c024256cb4a704 Mon Sep 17 00:00:00 2001 From: Mady Mellor Date: Thu, 29 Jul 2021 13:55:18 -0700 Subject: [PATCH] Remove BUBBLE_EXPANDED state from ScrimController I don't think this is needed at all after removing bubble scrim from ScrimController. Additionally, this fixes the issue where QS didn't have a background when pulled down on top of bubbles. Test: manual - expand a bubble & pull down the shade => verify QS look normal - expand a bubble, tap the manage button, collapse the bubble & pull down the shade => verify QS look normal Test: atest ScrimControllerTest Bug: 191338071 Bug: 191769064 Change-Id: Ie7aaec551700c823cce5cf6f4ea4f650b640ab63 --- .../statusbar/phone/ScrimController.java | 8 +++----- .../systemui/statusbar/phone/ScrimState.java | 17 ----------------- .../systemui/statusbar/phone/StatusBar.java | 2 -- .../statusbar/phone/ScrimControllerTest.java | 19 +------------------ 4 files changed, 4 insertions(+), 42 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java index 9d2f1f8717083..43a8630e27910 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -480,8 +480,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump boolean relevantState = (mState == ScrimState.UNLOCKED || mState == ScrimState.KEYGUARD || mState == ScrimState.SHADE_LOCKED - || mState == ScrimState.PULSING - || mState == ScrimState.BUBBLE_EXPANDED); + || mState == ScrimState.PULSING); if (!(relevantState && mExpansionAffectsAlpha)) { return; } @@ -548,8 +547,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump mQsBottomVisible = qsBottomVisible; boolean relevantState = (mState == ScrimState.SHADE_LOCKED || mState == ScrimState.KEYGUARD - || mState == ScrimState.PULSING - || mState == ScrimState.BUBBLE_EXPANDED); + || mState == ScrimState.PULSING); if (!(relevantState && mExpansionAffectsAlpha)) { return; } @@ -622,7 +620,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump return; } - if (mState == ScrimState.UNLOCKED || mState == ScrimState.BUBBLE_EXPANDED) { + if (mState == ScrimState.UNLOCKED) { // Darken scrim as you pull down the shade when unlocked, unless the shade is expanding // because we're doing the screen off animation. if (!mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java index 0297384de715b..e33c9f84aa739 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java @@ -250,23 +250,6 @@ public enum ScrimState { updateScrimColor(mScrimBehind, 1f /* alpha */, Color.BLACK); } } - }, - - /** - * Unlocked with a bubble expanded. - */ - BUBBLE_EXPANDED { - @Override - public void prepare(ScrimState previousState) { - mFrontTint = Color.TRANSPARENT; - mBehindTint = Color.TRANSPARENT; - - mFrontAlpha = 0f; - mBehindAlpha = mDefaultScrimAlpha; - - mAnimationDuration = ScrimController.ANIMATION_DURATION; - mBlankScreen = false; - } }; boolean mBlankScreen = false; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index b0e6cd62a6ce1..60e3e679b0cb8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -4481,8 +4481,6 @@ public class StatusBar extends SystemUI implements DemoMode, mScrimController.transitionTo(ScrimState.AOD); } else if (mIsKeyguard && !unlocking) { mScrimController.transitionTo(ScrimState.KEYGUARD); - } else if (mBubblesOptional.isPresent() && mBubblesOptional.get().isStackExpanded()) { - mScrimController.transitionTo(ScrimState.BUBBLE_EXPANDED, mUnlockScrimCallback); } else { mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java index f4421f1393fbb..30fc13b168f36 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java @@ -642,23 +642,6 @@ public class ScrimControllerTest extends SysuiTestCase { mScrimBehind, SEMI_TRANSPARENT)); } - @Test - public void transitionToBubbleExpanded() { - mScrimController.transitionTo(ScrimState.BUBBLE_EXPANDED); - finishAnimationsImmediately(); - - assertScrimTinted(Map.of( - mScrimInFront, false, - mScrimBehind, false - )); - - // Front scrim should be transparent - assertEquals(ScrimController.TRANSPARENT, - mScrimInFront.getViewAlpha(), 0.0f); - // Back scrim should be visible - assertEquals(ScrimController.BUSY_SCRIM_ALPHA, - mScrimBehind.getViewAlpha(), 0.0f); - } @Test public void scrimStateCallback() { @@ -1061,7 +1044,7 @@ public class ScrimControllerTest extends SysuiTestCase { HashSet regularStates = new HashSet<>(Arrays.asList( ScrimState.UNINITIALIZED, ScrimState.KEYGUARD, ScrimState.BOUNCER, ScrimState.BOUNCER_SCRIMMED, ScrimState.BRIGHTNESS_MIRROR, ScrimState.UNLOCKED, - ScrimState.BUBBLE_EXPANDED, ScrimState.SHADE_LOCKED, ScrimState.AUTH_SCRIMMED)); + ScrimState.SHADE_LOCKED, ScrimState.AUTH_SCRIMMED)); for (ScrimState state : ScrimState.values()) { if (!lowPowerModeStates.contains(state) && !regularStates.contains(state)) {