drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Scrim: Do not interact with scrim with hint" into tm-dev

Browse Source
This commit is contained in:
Aaron Liu 2022-03-24 17:15:32 +00:00 committed by Android (Google) Code Review
commit d1700b3355
2 changed files with 10 additions and 0 deletions
Show Stats 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

@ -3210,12 +3210,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();
}