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

Commit 1121ac18 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Fix notification stuck on AOD" into qt-r1-dev 

am: 08fcdd98

Change-Id: I2c4252d85979437a0c8becf70f9e710b2b30f83f
parents ed09f981 08fcdd98

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

+8 −0
Original line number Diff line number Diff line
@@ -149,6 +149,14 @@ public class DozeScrimController implements StateListener { 
        mHandler.removeCallbacks(mPulseOut);

    }



    /**

     * When pulsing, cancel any timeouts that would take you out of the pulsing state.

     */

    public void cancelPendingPulseTimeout() {

        mHandler.removeCallbacks(mPulseOut);

        mHandler.removeCallbacks(mPulseOutExtended);

    }



    private void cancelPulsing() {

        if (mPulseCallback != null) {

            if (DEBUG) Log.d(TAG, "Cancel pulsing");

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

+4 −3
Original line number Diff line number Diff line
@@ -1569,9 +1569,10 @@ public class StatusBar extends SystemUI implements DemoMode, 
    @Override

    public void onHeadsUpStateChanged(NotificationEntry entry, boolean isHeadsUp) {

        mEntryManager.updateNotifications();

        if (isDozing()) {

            if (isHeadsUp) {

        if (isDozing() && isHeadsUp) {

            mDozeServiceHost.fireNotificationPulse();

            if (mPulsing) {

                mDozeScrimController.cancelPendingPulseTimeout();

            }

        }

        if (!isHeadsUp && !mHeadsUpManager.hasNotifications()) {