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

Commit 299c87ac authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Fix issue where notifications should not animate" into qt-dev am: acd959e5 

am: 60b7f908

Change-Id: Ib6dea3c9a4d3f788da81d60d6ff8149820b4205b
parents 30de9478 60b7f908

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

+5 −1
Original line number Diff line number Diff line
@@ -3639,6 +3639,7 @@ public class StatusBar extends SystemUI implements DemoMode, 


        @Override

        public void onStartedGoingToSleep() {

            updateNotificationPanelTouchState();

            notifyHeadsUpGoingToSleep();

            dismissVolumeDialog();

        }
@@ -3671,7 +3672,10 @@ public class StatusBar extends SystemUI implements DemoMode, 
     * Keyguard.

     */

    private void updateNotificationPanelTouchState() {

        mNotificationPanel.setTouchAndAnimationDisabled(!mDeviceInteractive && !mPulsing);

        boolean goingToSleepWithoutAnimation = isGoingToSleep()

                && !DozeParameters.getInstance(mContext).shouldControlScreenOff();

        mNotificationPanel.setTouchAndAnimationDisabled((!mDeviceInteractive && !mPulsing)

                || goingToSleepWithoutAnimation);

    }



    final ScreenLifecycle.Observer mScreenObserver = new ScreenLifecycle.Observer() {