diff options
2 files changed, 10 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java index 7882fffe6b4c..999ebc11b621 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java @@ -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); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java index 21d03adb64ef..5add2f2a5148 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java @@ -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(); } |