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

Scrim: Do not interact with scrim with hint

Browse Source 
When hint animation is running, we want to disable scrim logic.

Bug: 226403870
Test: Manual on device
Change-Id: Ibf12fce8ab167a641d1089e4bce7163ca66d5a51
This commit is contained in:
Aaron Liu
2022-03-23 19:36:42 +00:00
parent 9dc8e3b27a
commit 8782caa6d8
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3203,12 +3203,14 @@ public class NotificationPanelViewController extends PanelViewController {
@Override
protected void onUnlockHintFinished() {
super.onUnlockHintFinished();
mScrimController.setExpansionAffectsAlpha(true);
mNotificationStackScrollLayoutController.setUnlockHintRunning(false);
}
@Override
protected void onUnlockHintStarted() {
super.onUnlockHintStarted();
mScrimController.setExpansionAffectsAlpha(false);
mNotificationStackScrollLayoutController.setUnlockHintRunning(true);
}

8
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java
View File

@@ -930,6 +930,14 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
verify(mLargeScreenShadeHeaderController).setActive(false);
}
@Test
public void testUnlockAnimationDoesNotAffectScrim() {
mNotificationPanelViewController.onUnlockHintStarted();
verify(mScrimController).setExpansionAffectsAlpha(false);
mNotificationPanelViewController.onUnlockHintFinished();
verify(mScrimController).setExpansionAffectsAlpha(true);
}
private void triggerPositionClockAndNotifications() {
mNotificationPanelViewController.closeQs();
}