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

Commit 50a53c2d authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix notification stuck on AOD" into qt-r1-dev am: 08fcdd98 am: 8cb08c0d"

parents 85650446 88d331da

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
@@ -1566,9 +1566,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()) {