Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I41d4e0c5abf28ac710dd9ef03d6914dd1b78495c
This commit is contained in:
TreeHugger Robot
2020-06-15 18:26:34 +00:00
committed by Automerger Merge Worker
parent 16a6108580 518c3b664e
commit 6cd4c7d6a4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4006,7 +4006,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);
} }