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

Merge "Keeping notifications around that show guts" into oc-dr1-dev

Browse Source 
am: ea2cbdecca

Change-Id: Ie9e2152a7aadf1f9b3cd42aa6a3791cb62ab34bc
This commit is contained in:
Adrian Roos
2017-07-07 11:27:15 +00:00
committed by android-build-merger
parent dd14195538 ea2cbdecca
commit b42d05d64f
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -736,6 +736,7 @@ public class StatusBar extends SystemUI implements DemoMode,
private HashMap<String, Entry> mPendingNotifications = new HashMap<>(); private HashMap<String, Entry> mPendingNotifications = new HashMap<>();
private boolean mClearAllEnabled; private boolean mClearAllEnabled;
@Nullable private View mAmbientIndicationContainer; @Nullable private View mAmbientIndicationContainer;
private String mKeyToRemoveOnGutsClosed;
private SysuiColorExtractor mColorExtractor; private SysuiColorExtractor mColorExtractor;
private ForegroundServiceController mForegroundServiceController; private ForegroundServiceController mForegroundServiceController;
@@ -1789,6 +1790,13 @@ public class StatusBar extends SystemUI implements DemoMode,
mRemoteInputEntriesToRemoveOnCollapse.add(entry); mRemoteInputEntriesToRemoveOnCollapse.add(entry);
return; return;
} }
if (entry != null && mNotificationGutsExposed != null
&& mNotificationGutsExposed == entry.row.getGuts()) {
Log.w(TAG, "Keeping notification because it's showing guts. " + key);
mLatestRankingMap = ranking;
mKeyToRemoveOnGutsClosed = key;
return;
}
if (entry != null) { if (entry != null) {
mForegroundServiceController.removeNotification(entry.notification); mForegroundServiceController.removeNotification(entry.notification);
@@ -3465,6 +3473,8 @@ public class StatusBar extends SystemUI implements DemoMode,
pw.println(Settings.Global.zenModeToString(mZenMode)); pw.println(Settings.Global.zenModeToString(mZenMode));
pw.print(" mUseHeadsUp="); pw.print(" mUseHeadsUp=");
pw.println(mUseHeadsUp); pw.println(mUseHeadsUp);
pw.print(" mKeyToRemoveOnGutsClosed=");
pw.println(mKeyToRemoveOnGutsClosed);
if (mStatusBarView != null) { if (mStatusBarView != null) {
dumpBarTransitions(pw, "mStatusBarView", mStatusBarView.getBarTransitions()); dumpBarTransitions(pw, "mStatusBarView", mStatusBarView.getBarTransitions());
} }
@@ -6130,6 +6140,11 @@ public class StatusBar extends SystemUI implements DemoMode,
mNotificationGutsExposed = null; mNotificationGutsExposed = null;
mGutsMenuItem = null; mGutsMenuItem = null;
} }
String key = sbn.getKey();
if (key.equals(mKeyToRemoveOnGutsClosed)) {
mKeyToRemoveOnGutsClosed = null;
removeNotification(key, mLatestRankingMap);
}
}); });
View gutsView = item.getGutsView(); View gutsView = item.getGutsView();
@@ -7088,9 +7103,12 @@ public class StatusBar extends SystemUI implements DemoMode,
Entry entry = mNotificationData.get(key); Entry entry = mNotificationData.get(key);
if (entry == null) { if (entry == null) {
return; return;
} else { }
mHeadsUpEntriesToRemoveOnSwitch.remove(entry); mHeadsUpEntriesToRemoveOnSwitch.remove(entry);
mRemoteInputEntriesToRemoveOnCollapse.remove(entry); mRemoteInputEntriesToRemoveOnCollapse.remove(entry);
if (key.equals(mKeyToRemoveOnGutsClosed)) {
mKeyToRemoveOnGutsClosed = null;
Log.w(TAG, "Notification that was kept for guts was updated. " + key);
} }
Notification n = notification.getNotification(); Notification n = notification.getNotification();