Merge "Call the scrim unlock callback when transitioning to BUBBLES_EXPANDED." into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-06-15 18:00:33 +00:00
committed by Android (Google) Code Review

View File

@@ -3984,7 +3984,7 @@ public class StatusBar extends SystemUI implements DemoMode,
} else if (mIsKeyguard && !unlocking) { } else if (mIsKeyguard && !unlocking) {
mScrimController.transitionTo(ScrimState.KEYGUARD); mScrimController.transitionTo(ScrimState.KEYGUARD);
} else if (mBubbleController.isStackExpanded()) { } else if (mBubbleController.isStackExpanded()) {
mScrimController.transitionTo(ScrimState.BUBBLE_EXPANDED); mScrimController.transitionTo(ScrimState.BUBBLE_EXPANDED, mUnlockScrimCallback);
} else { } else {
mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback); mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback);
} }