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

Show localized channel names

Browse Source 
Test: manual
Change-Id: I85d60e564aeff8074cdb8138fe7ac1c078be986a
This commit is contained in:
Julia Reynolds
2017-03-01 16:59:10 -05:00
parent 6d3947e2c1
commit 3327eac198
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,13 +182,13 @@ public class AppNotificationSettings extends NotificationSettingsBase {
getPrefContext());
channelPref.setDisabledByAdmin(mSuspendedAppsAdmin);
channelPref.setKey(channel.getId());
channelPref.setTitle(channel.getName());
channelPref.setTitle(getNotificationChannelLabel(channel));
channelPref.setChecked(channel.getImportance() != IMPORTANCE_NONE);
channelPref.setMultiLine(true);
if (channel.isDeleted()) {
channelPref.setTitle(
getString(R.string.deleted_channel_name, channel.getName()));
channelPref.setTitle(getString(R.string.deleted_channel_name,
getNotificationChannelLabel(channel)));
channelPref.setEnabled(false);
} else {
channelPref.setSummary(getImportanceSummary(channel.getImportance()));
@@ -275,8 +275,10 @@ public class AppNotificationSettings extends NotificationSettingsBase {
if (left.isDeleted() != right.isDeleted()) {
return Boolean.compare(left.isDeleted(), right.isDeleted());
}
if (!Objects.equals(left.getName(), right.getName())) {
return sCollator.compare(left.getName().toString(), right.getName().toString());
if (!Objects.equals(getNotificationChannelLabel(left),
getNotificationChannelLabel(right))) {
return sCollator.compare(getNotificationChannelLabel(left).toString(),
getNotificationChannelLabel(right).toString());
}
return left.getId().compareTo(right.getId());
}