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

Merge "Category message is sufficient for message notif" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-21 17:43:40 +00:00
committed by Android (Google) Code Review
parent 2dae40bfe6 eb455965ef
commit b24d84b222
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/java/com/android/internal/util/NotificationMessagingUtil.java
View File

@@ -26,7 +26,6 @@ import android.os.Looper;
import android.os.UserHandle;
import android.provider.Settings;
import android.service.notification.StatusBarNotification;
import android.text.TextUtils;
import android.util.ArrayMap;
import java.util.Objects;
@@ -47,6 +46,18 @@ public class NotificationMessagingUtil {
Settings.Secure.getUriFor(DEFAULT_SMS_APP_SETTING), false, mSmsContentObserver);
}
public boolean isImportantMessaging(StatusBarNotification sbn, int importance) {
if (importance < NotificationManager.IMPORTANCE_LOW) {
return false;
}
return hasMessagingStyle(sbn) || (isCategoryMessage(sbn) && isDefaultMessagingApp(sbn));
}
public boolean isMessaging(StatusBarNotification sbn) {
return hasMessagingStyle(sbn) || isDefaultMessagingApp(sbn) || isCategoryMessage(sbn);
}
@SuppressWarnings("deprecation")
private boolean isDefaultMessagingApp(StatusBarNotification sbn) {
final int userId = sbn.getUserId();
@@ -73,25 +84,12 @@ public class NotificationMessagingUtil {
}
};
public boolean isImportantMessaging(StatusBarNotification sbn, int importance) {
if (importance < NotificationManager.IMPORTANCE_LOW) {
return false;
}
return isMessaging(sbn);
private boolean hasMessagingStyle(StatusBarNotification sbn) {
Class<? extends Notification.Style> style = sbn.getNotification().getNotificationStyle();
return Notification.MessagingStyle.class.equals(style);
}
public boolean isMessaging(StatusBarNotification sbn) {
Class<? extends Notification.Style> style = sbn.getNotification().getNotificationStyle();
if (Notification.MessagingStyle.class.equals(style)) {
return true;
}
if (Notification.CATEGORY_MESSAGE.equals(sbn.getNotification().category)
&& isDefaultMessagingApp(sbn)) {
return true;
}
return false;
private boolean isCategoryMessage(StatusBarNotification sbn) {
return Notification.CATEGORY_MESSAGE.equals(sbn.getNotification().category);
}
}