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

Commit f113a07d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix snooze not dismissing when it should" into oc-dr1-dev

parents e6685b2b 32343e6b

packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java

+4 −0
Original line number Diff line number Diff line
@@ -329,4 +329,8 @@ public class NotificationGuts extends FrameLayout { 
    public boolean isExposed() {

        return mExposed;

    }



    public boolean isLeavebehind() {

        return mGutsContent != null && mGutsContent.isLeavebehind();

    }

}

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

+2 −1
Original line number Diff line number Diff line
@@ -1790,7 +1790,8 @@ public class StatusBar extends SystemUI implements DemoMode, 
            return;

        }

        if (entry != null && mNotificationGutsExposed != null

                && mNotificationGutsExposed == entry.row.getGuts()) {

                && mNotificationGutsExposed == entry.row.getGuts() && entry.row.getGuts() != null

                && !entry.row.getGuts().isLeavebehind()) {

            Log.w(TAG, "Keeping notification because it's showing guts. " + key);

            mLatestRankingMap = ranking;

            mKeyToRemoveOnGutsClosed = key;