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 
am: f113a07d9e

Change-Id: I71e7c2757c1fab1dfdcd59ab3dbf695179899fe7
This commit is contained in:
Mady Mellor
2017-07-20 00:09:05 +00:00
committed by android-build-merger
parent 0888ce471a f113a07d9e
commit b2e49ed777
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() {
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;
}
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;