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

Commit 07bae3a3 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 

am: 299c87ac

Change-Id: Id237bd6ede38e3b638fe8cbf79d63cc4d1e513e5
parents 86cb9d0a 299c87ac

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

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




        @Override

        @Override

        public void onStartedGoingToSleep() {

        public void onStartedGoingToSleep() {

            updateNotificationPanelTouchState();

            notifyHeadsUpGoingToSleep();

            notifyHeadsUpGoingToSleep();

            dismissVolumeDialog();

            dismissVolumeDialog();

        }

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

     * Keyguard.

     */

     */

    private void updateNotificationPanelTouchState() {

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

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