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

Commit 0b7e0c60 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I3861ac7f6c733ee8df0209cde9397a51c06b8171
parents 056e4ac6 d1700b33

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();

    }