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

Merge "Switch from shortlabel to label" into rvc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2020-05-21 18:53:24 +00:00
committed by Android (Google) Code Review
parent 31f96bbcf6 04d50c9709
commit 6d63120295
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/notification/app/AppConversationListPreferenceController.java
View File

@@ -150,7 +150,7 @@ public class AppConversationListPreferenceController extends NotificationPrefere
ShortcutInfo si = conversation.getShortcutInfo();
pref.setTitle(si != null
? si.getShortLabel()
? si.getLabel()
: conversation.getNotificationChannel().getName());
pref.setSummary(conversation.getNotificationChannel().getGroup() != null
? mContext.getString(R.string.notification_conversation_summary,

2
src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java
View File

@@ -124,7 +124,7 @@ public class ConversationHeaderPreferenceController extends NotificationPreferen
@VisibleForTesting
CharSequence getLabel() {
return mConversationInfo != null
? mConversationInfo.getShortLabel()
? mConversationInfo.getLabel()
: mChannel.getName();
}
}

6
src/com/android/settings/notification/app/ConversationListPreferenceController.java
View File

@@ -116,7 +116,7 @@ public abstract class ConversationListPreferenceController extends AbstractPrefe
CharSequence getTitle(ConversationChannelWrapper conversation) {
ShortcutInfo si = conversation.getShortcutInfo();
return si != null
? si.getShortLabel()
? si.getLabel()
: conversation.getNotificationChannel().getName();
}
@@ -154,8 +154,8 @@ public abstract class ConversationListPreferenceController extends AbstractPrefe
return o1.getNotificationChannel().getId().compareTo(
o2.getNotificationChannel().getId());
}
return sCollator.compare(o1.getShortcutInfo().getShortLabel(),
o2.getShortcutInfo().getShortLabel());
return sCollator.compare(o1.getShortcutInfo().getLabel(),
o2.getShortcutInfo().getLabel());
}
};
}