Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-20 00:00:46 +00:00
committed by Android (Google) Code Review
parent e6685b2bcd 32343e6bd9
commit f113a07d9e
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java
View File

@@ -329,4 +329,8 @@ public class NotificationGuts extends FrameLayout {
public boolean isExposed() { public boolean isExposed() {
return mExposed; return mExposed;
} }
public boolean isLeavebehind() {
return mGutsContent != null && mGutsContent.isLeavebehind();
}
} }

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

@@ -1790,7 +1790,8 @@ public class StatusBar extends SystemUI implements DemoMode,
return; return;
} }
if (entry != null && mNotificationGutsExposed != null 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); Log.w(TAG, "Keeping notification because it's showing guts. " + key);
mLatestRankingMap = ranking; mLatestRankingMap = ranking;
mKeyToRemoveOnGutsClosed = key; mKeyToRemoveOnGutsClosed = key;