Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cd4c7d6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Call the scrim unlock callback when transitioning to BUBBLES_EXPANDED."... 

Merge "Call the scrim unlock callback when transitioning to BUBBLES_EXPANDED." into rvc-dev am: 928625a8 am: 518c3b66

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863863

Change-Id: I41d4e0c5abf28ac710dd9ef03d6914dd1b78495c
parents 16a61085 518c3b66

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+1 −1
Original line number Diff line number Diff line
@@ -4006,7 +4006,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
        } else if (mIsKeyguard && !unlocking) {

            mScrimController.transitionTo(ScrimState.KEYGUARD);

        } else if (mBubbleController.isStackExpanded()) {

            mScrimController.transitionTo(ScrimState.BUBBLE_EXPANDED);

            mScrimController.transitionTo(ScrimState.BUBBLE_EXPANDED, mUnlockScrimCallback);

        } else {

            mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback);

        }