Merge "Emit onRankingApplied in NEM" into rvc-dev

This commit is contained in:
Ned Burns
2020-04-03 19:36:20 +00:00
committed by Android (Google) Code Review
2 changed files with 17 additions and 2 deletions

View File

@@ -539,7 +539,8 @@ public class NotificationEntryManager implements
}
}
private void addNotificationInternal(StatusBarNotification notification,
private void addNotificationInternal(
StatusBarNotification notification,
RankingMap rankingMap) throws InflationException {
String key = notification.getKey();
if (DEBUG) {
@@ -579,6 +580,9 @@ public class NotificationEntryManager implements
for (NotifCollectionListener listener : mNotifCollectionListeners) {
listener.onEntryAdded(entry);
}
for (NotifCollectionListener listener : mNotifCollectionListeners) {
listener.onRankingApplied();
}
}
public void addNotification(StatusBarNotification notification, RankingMap ranking) {
@@ -635,6 +639,9 @@ public class NotificationEntryManager implements
for (NotificationEntryListener listener : mNotificationEntryListeners) {
listener.onPostEntryUpdated(entry);
}
for (NotifCollectionListener listener : mNotifCollectionListeners) {
listener.onRankingApplied();
}
}
public void updateNotification(StatusBarNotification notification, RankingMap ranking) {
@@ -693,6 +700,9 @@ public class NotificationEntryManager implements
for (NotifCollectionListener listener : mNotifCollectionListeners) {
listener.onRankingUpdate(rankingMap);
}
for (NotifCollectionListener listener : mNotifCollectionListeners) {
listener.onRankingApplied();
}
}
private void updateRankingOfPendingNotifications(@Nullable RankingMap rankingMap) {
@@ -799,6 +809,9 @@ public class NotificationEntryManager implements
*/
public void updateRanking(RankingMap rankingMap, String reason) {
updateRankingAndSort(rankingMap, reason);
for (NotifCollectionListener listener : mNotifCollectionListeners) {
listener.onRankingApplied();
}
}
/** Resorts / filters the current notification set with the current RankingMap */

View File

@@ -74,7 +74,9 @@ public interface NotifCollectionListener {
* non-lifetime-extended notification entries will have their ranking object updated.
*
* Ranking updates occur whenever a notification is added, updated, or removed, or when a
* standalone ranking is sent from the server.
* standalone ranking is sent from the server. If a non-standalone ranking is applied, the event
* that accompanied the ranking is emitted first (e.g. {@link #onEntryAdded}), followed by the
* ranking event.
*/
default void onRankingApplied() {
}