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

Notification channel group res id labels.

Browse Source 
Test: manual
Change-Id: Icf7208dc952a7306f04d53f4d681ec794563f2fd
This commit is contained in:
Julia Reynolds
2017-03-02 16:00:09 -05:00
parent b79eec9e50
commit ca662cc9a7
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/notification/AppNotificationSettings.java
View File

@@ -161,12 +161,12 @@ public class AppNotificationSettings extends NotificationSettingsBase {
} else {
for (NotificationChannelGroup group : mChannelGroupList) {
PreferenceCategory groupCategory = new PreferenceCategory(getPrefContext());
if (group.getName() == null) {
if (group.getId() == null) {
groupCategory.setTitle(mChannelGroupList.size() > 1
? R.string.notification_channels_other
: R.string.notification_channels);
} else {
groupCategory.setTitle(group.getName());
groupCategory.setTitle(getNotificationGroupLabel(group));
}
groupCategory.setKey(group.getId());
groupCategory.setOrderingAsAdded(true);
@@ -275,10 +275,10 @@ public class AppNotificationSettings extends NotificationSettingsBase {
if (left.isDeleted() != right.isDeleted()) {
return Boolean.compare(left.isDeleted(), right.isDeleted());
}
if (!Objects.equals(getNotificationChannelLabel(left),
getNotificationChannelLabel(right))) {
return sCollator.compare(getNotificationChannelLabel(left).toString(),
getNotificationChannelLabel(right).toString());
CharSequence leftName = getNotificationChannelLabel(left);
CharSequence rightName = getNotificationChannelLabel(right);
if (!Objects.equals(leftName, rightName)) {
return sCollator.compare(leftName.toString(), rightName.toString());
}
return left.getId().compareTo(right.getId());
}
@@ -296,10 +296,11 @@ public class AppNotificationSettings extends NotificationSettingsBase {
} else if (right.getId() == null && left.getId() != null) {
return -1;
}
CharSequence leftName = getNotificationGroupLabel(left);
CharSequence rightName = getNotificationGroupLabel(right);
// sort rest of the groups by name
if (!Objects.equals(left.getName(), right.getName())) {
return sCollator.compare(left.getName().toString(),
right.getName().toString());
if (!Objects.equals(leftName, rightName)) {
return sCollator.compare(leftName.toString(), rightName.toString());
}
return left.getId().compareTo(right.getId());
}