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

Merge "Reintroduce priority to notification sorting order." into nyc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2016-03-03 20:32:07 +00:00
committed by Android (Google) Code Review
parent 4de246e775 dbc114f4bb
commit ba5c35b797
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/notification/NotificationComparator.java
View File

@@ -28,10 +28,11 @@ public class NotificationComparator
final int leftImportance = left.getImportance();
final int rightImportance = right.getImportance();
if (leftImportance != rightImportance) {
// by priority, high to low
// by importance, high to low
return -1 * Integer.compare(leftImportance, rightImportance);
}
// Whether or not the notification can bypass DND.
final int leftPackagePriority = left.getPackagePriority();
final int rightPackagePriority = right.getPackagePriority();
if (leftPackagePriority != rightPackagePriority) {
@@ -39,6 +40,13 @@ public class NotificationComparator
return -1 * Integer.compare(leftPackagePriority, rightPackagePriority);
}
final int leftPriority = left.sbn.getNotification().priority;
final int rightPriority = right.sbn.getNotification().priority;
if (leftPriority != rightPriority) {
// by priority, high to low
return -1 * Integer.compare(leftPriority, rightPriority);
}
final float leftPeople = left.getContactAffinity();
final float rightPeople = right.getContactAffinity();
if (leftPeople != rightPeople) {