Merge "Updates notification row when importance changes." (888f39f8) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -952,10 +952,12 @@ public class NotificationEntryManager implements Dumpable, NotificationInflater.

		// Has a copy of the current UI adjustments.
		ArrayMap<String, NotificationUiAdjustment> oldAdjustments = new ArrayMap<>();
		ArrayMap<String, Integer> oldImportances = new ArrayMap<>();
		for (NotificationData.Entry entry : entries) {
		NotificationUiAdjustment adjustment =
		NotificationUiAdjustment.extractFromNotificationEntry(entry);
		oldAdjustments.put(entry.key, adjustment);
		oldImportances.put(entry.key, entry.importance);
		}

		// Populate notification entries from the new rankings.
		@@ -978,6 +980,11 @@ public class NotificationEntryManager implements Dumpable, NotificationInflater.
		// Once the RowInflaterTask is done, it will pick up the updated entry, so
		// no-op here.
		}
		} else if (oldImportances.containsKey(entry.key)
		&& entry.importance != oldImportances.get(entry.key)) {
		if (entry.rowExists()) {
		entry.getRow().onNotificationRankingUpdated();
		}
		}
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -588,6 +588,13 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		updateRippleAllowed();
		}

		/** Called when the notification's ranking was changed (but nothing else changed). */
		public void onNotificationRankingUpdated() {
		if (mMenuRow != null) {
		mMenuRow.onNotificationUpdated(mStatusBarNotification);
		}
		}

		@VisibleForTesting
		void updateShelfIconColor() {
		StatusBarIconView expandedIcon = mEntry.expandedIcon;