Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1700b33 authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

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

parents 95387ac8 8782caa6

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

+2 −0
Original line number Diff line number Diff line
@@ -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);

    }

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

+8 −0
Original line number Diff line number Diff line
@@ -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();

    }