Merge "Only cancel the group notification if launcher canceled last child" into ub-launcher3-master (f9855579) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/notification/NotificationListener.java

+17 −2

Original line number	Diff line number	Diff line
		@@ -74,6 +74,9 @@ public class NotificationListener extends NotificationListenerService {
		/** Maps keys to their corresponding current group key */
		private final Map<String, String> mNotificationGroupKeyMap = new HashMap<>();

		/** The last notification key that was dismissed from launcher UI */
		private String mLastKeyDismissedByLauncher;

		private SettingsObserver mNotificationBadgingObserver;

		private final Handler.Callback mWorkerCallback = new Handler.Callback() {
		@@ -251,13 +254,25 @@ public class NotificationListener extends NotificationListenerService {
		}

		NotificationGroup notificationGroup = mNotificationGroupMap.get(sbn.getGroupKey());
		String key = sbn.getKey();
		if (notificationGroup != null) {
		notificationGroup.removeChildKey(sbn.getKey());
		notificationGroup.removeChildKey(key);
		if (notificationGroup.isEmpty()) {
		if (key.equals(mLastKeyDismissedByLauncher)) {
		// Only cancel the group notification if launcher dismissed the last child.
		cancelNotification(notificationGroup.getGroupSummaryKey());
		}
		mNotificationGroupMap.remove(sbn.getGroupKey());
		}
		}
		if (key.equals(mLastKeyDismissedByLauncher)) {
		mLastKeyDismissedByLauncher = null;
		}
		}

		public void cancelNotificationFromLauncher(String key) {
		mLastKeyDismissedByLauncher = key;
		cancelNotification(key);
		}

		@Override

+1 −1

Original line number	Diff line number	Diff line
		@@ -206,7 +206,7 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan
		if (notificationListener == null) {
		return;
		}
		notificationListener.cancelNotification(notificationKey);
		notificationListener.cancelNotificationFromLauncher(notificationKey);
		}

		public void setAllWidgets(ArrayList<WidgetListRowEntry> allWidgets) {