PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ensure that filtered notifications are removed from BadgeInfo." into ub-launcher3-master

Browse Source
This commit is contained in:
Tony Wickham
2017-02-16 23:17:31 +00:00
committed by Android (Google) Code Review
parent 93bc3c1e41 988f34b7f2
commit 2f64ffe53e
2 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/notification/NotificationListener.java
+25 -15
View File
@@ -80,9 +80,9 @@ public class NotificationListener extends NotificationListenerService {
switch (message.what) {
case MSG_NOTIFICATION_POSTED:
if (sNotificationsChangedListener != null) {
Pair<PackageUserKey, String> pair
= (Pair<PackageUserKey, String>) message.obj;
sNotificationsChangedListener.onNotificationPosted(pair.first, pair.second);
NotificationPostedMsg msg = (NotificationPostedMsg) message.obj;
sNotificationsChangedListener.onNotificationPosted(msg.packageUserKey,
msg.notificationKey, msg.shouldBeFilteredOut);
}
break;
case MSG_NOTIFICATION_REMOVED:
@@ -149,23 +149,32 @@ public class NotificationListener extends NotificationListenerService {
@Override
public void onNotificationPosted(final StatusBarNotification sbn) {
super.onNotificationPosted(sbn);
if (!shouldBeFilteredOut(sbn.getNotification())) {
Pair<PackageUserKey, String> packageUserKeyAndNotificationKey
= new Pair<>(PackageUserKey.fromNotification(sbn), sbn.getKey());
mWorkerHandler.obtainMessage(MSG_NOTIFICATION_POSTED, packageUserKeyAndNotificationKey)
.sendToTarget();
mWorkerHandler.obtainMessage(MSG_NOTIFICATION_POSTED, new NotificationPostedMsg(sbn))
.sendToTarget();
}
/**
* An object containing data to send to MSG_NOTIFICATION_POSTED targets.
*/
private class NotificationPostedMsg {
PackageUserKey packageUserKey;
String notificationKey;
boolean shouldBeFilteredOut;
NotificationPostedMsg(StatusBarNotification sbn) {
packageUserKey = PackageUserKey.fromNotification(sbn);
notificationKey = sbn.getKey();
shouldBeFilteredOut = shouldBeFilteredOut(sbn.getNotification());
}
}
@Override
public void onNotificationRemoved(final StatusBarNotification sbn) {
super.onNotificationRemoved(sbn);
if (!shouldBeFilteredOut(sbn.getNotification())) {
Pair<PackageUserKey, String> packageUserKeyAndNotificationKey
= new Pair<>(PackageUserKey.fromNotification(sbn), sbn.getKey());
mWorkerHandler.obtainMessage(MSG_NOTIFICATION_REMOVED, packageUserKeyAndNotificationKey)
.sendToTarget();
}
Pair<PackageUserKey, String> packageUserKeyAndNotificationKey
= new Pair<>(PackageUserKey.fromNotification(sbn), sbn.getKey());
mWorkerHandler.obtainMessage(MSG_NOTIFICATION_REMOVED, packageUserKeyAndNotificationKey)
.sendToTarget();
}
/** This makes a potentially expensive binder call and should be run on a background thread. */
@@ -206,7 +215,8 @@ public class NotificationListener extends NotificationListenerService {
}
public interface NotificationsChangedListener {
void onNotificationPosted(PackageUserKey postedPackageUserKey, String notificationKey);
void onNotificationPosted(PackageUserKey postedPackageUserKey, String notificationKey,
boolean shouldBeFilteredOut);
void onNotificationRemoved(PackageUserKey removedPackageUserKey, String notificationKey);
void onNotificationFullRefresh(List<StatusBarNotification> activeNotifications);
}
src/com/android/launcher3/popup/PopupDataProvider.java
+15 -8
View File
@@ -58,19 +58,26 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan
}
@Override
public void onNotificationPosted(PackageUserKey postedPackageUserKey, String notificationKey) {
public void onNotificationPosted(PackageUserKey postedPackageUserKey, String notificationKey,
boolean shouldBeFilteredOut) {
BadgeInfo badgeInfo = mPackageUserToBadgeInfos.get(postedPackageUserKey);
boolean notificationWasAdded; // As opposed to updated.
boolean notificationWasAddedOrRemoved; // As opposed to updated.
if (badgeInfo == null) {
BadgeInfo newBadgeInfo = new BadgeInfo(postedPackageUserKey);
newBadgeInfo.addNotificationKeyIfNotExists(notificationKey);
mPackageUserToBadgeInfos.put(postedPackageUserKey, newBadgeInfo);
notificationWasAdded = true;
if (!shouldBeFilteredOut) {
BadgeInfo newBadgeInfo = new BadgeInfo(postedPackageUserKey);
newBadgeInfo.addNotificationKeyIfNotExists(notificationKey);
mPackageUserToBadgeInfos.put(postedPackageUserKey, newBadgeInfo);
notificationWasAddedOrRemoved = true;
} else {
notificationWasAddedOrRemoved = false;
}
} else {
notificationWasAdded = badgeInfo.addNotificationKeyIfNotExists(notificationKey);
notificationWasAddedOrRemoved = shouldBeFilteredOut
? badgeInfo.removeNotificationKey(notificationKey)
: badgeInfo.addNotificationKeyIfNotExists(notificationKey);
}
updateLauncherIconBadges(Utilities.singletonHashSet(postedPackageUserKey),
notificationWasAdded);
notificationWasAddedOrRemoved);
}
@Override