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

SysUI: Upsort PRIORITY_MAX system notifications

Browse Source 
Bug: 17131219
Change-Id: Id29ef5c44a8221d514ea0a8cf5d0fe5dd179744b
This commit is contained in:
Christoph Studer
2014-09-03 12:51:26 +02:00
parent 09cfeaff8e
commit 1492116a1c
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
View File

@@ -99,15 +99,26 @@ public class NotificationData {
@Override
public int compare(Entry a, Entry b) {
String mediaNotification = mEnvironment.getCurrentMediaNotificationKey();
// Upsort current media notification.
String mediaNotification = mEnvironment.getCurrentMediaNotificationKey();
boolean aMedia = a.key.equals(mediaNotification);
boolean bMedia = b.key.equals(mediaNotification);
if (aMedia != bMedia) {
return aMedia ? -1 : 1;
}
final StatusBarNotification na = a.notification;
final StatusBarNotification nb = b.notification;
// Upsort PRIORITY_MAX system notifications
boolean aSystemMax = na.getNotification().priority >= Notification.PRIORITY_MAX &&
isSystemNotification(na);
boolean bSystemMax = nb.getNotification().priority >= Notification.PRIORITY_MAX &&
isSystemNotification(nb);
if (aSystemMax != bSystemMax) {
return aSystemMax ? -1 : 1;
}
// RankingMap as received from NoMan.
if (mRankingMap != null) {
mRankingMap.getRanking(a.key, mRankingA);
@@ -115,8 +126,6 @@ public class NotificationData {
return mRankingA.getRank() - mRankingB.getRank();
}
final StatusBarNotification na = a.notification;
final StatusBarNotification nb = b.notification;
int d = nb.getScore() - na.getScore();
if (a.interruption != b.interruption) {
return a.interruption ? -1 : 1;
@@ -296,6 +305,11 @@ public class NotificationData {
pw.println(" tickerText=\"" + n.getNotification().tickerText + "\"");
}
private static boolean isSystemNotification(StatusBarNotification sbn) {
String sbnPackage = sbn.getPackageName();
return "android".equals(sbnPackage) || "com.android.systemui".equals(sbnPackage);
}
/**
* Provides access to keyguard state and user settings dependent data.
*/