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

Switch from shortlabel to label

Browse Source 
Test: atest
Bug: 157140669
Change-Id: Iebcb2f076fef33b6f3ce16326af4e4c5c6770459
This commit is contained in:
Julia Reynolds
2020-05-20 14:23:43 -04:00
parent 39ceee9e00
commit 04d50c9709
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(); ShortcutInfo si = conversation.getShortcutInfo();
pref.setTitle(si != null pref.setTitle(si != null
? si.getShortLabel() ? si.getLabel()
: conversation.getNotificationChannel().getName()); : conversation.getNotificationChannel().getName());
pref.setSummary(conversation.getNotificationChannel().getGroup() != null pref.setSummary(conversation.getNotificationChannel().getGroup() != null
? mContext.getString(R.string.notification_conversation_summary, ? 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 @VisibleForTesting
CharSequence getLabel() { CharSequence getLabel() {
return mConversationInfo != null return mConversationInfo != null
? mConversationInfo.getShortLabel() ? mConversationInfo.getLabel()
: mChannel.getName(); : 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) { CharSequence getTitle(ConversationChannelWrapper conversation) {
ShortcutInfo si = conversation.getShortcutInfo(); ShortcutInfo si = conversation.getShortcutInfo();
return si != null return si != null
? si.getShortLabel() ? si.getLabel()
: conversation.getNotificationChannel().getName(); : conversation.getNotificationChannel().getName();
} }
@@ -154,8 +154,8 @@ public abstract class ConversationListPreferenceController extends AbstractPrefe
return o1.getNotificationChannel().getId().compareTo( return o1.getNotificationChannel().getId().compareTo(
o2.getNotificationChannel().getId()); o2.getNotificationChannel().getId());
} }
return sCollator.compare(o1.getShortcutInfo().getShortLabel(), return sCollator.compare(o1.getShortcutInfo().getLabel(),
o2.getShortcutInfo().getShortLabel()); o2.getShortcutInfo().getLabel());
} }
}; };
} }

4
tests/robotests/src/com/android/settings/notification/app/ConversationHeaderPreferenceControllerTest.java
View File

@@ -103,10 +103,10 @@ public class ConversationHeaderPreferenceControllerTest {
@Test @Test
public void testGetLabel() { public void testGetLabel() {
ShortcutInfo si = mock(ShortcutInfo.class); ShortcutInfo si = mock(ShortcutInfo.class);
when(si.getShortLabel()).thenReturn("hello"); when(si.getLabel()).thenReturn("hello");
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
mController.onResume(appRow, null, null, null, si, null); mController.onResume(appRow, null, null, null, si, null);
assertEquals(si.getShortLabel(), mController.getLabel()); assertEquals(si.getLabel(), mController.getLabel());
NotificationChannel channel = new NotificationChannel("cid", "cname", IMPORTANCE_NONE); NotificationChannel channel = new NotificationChannel("cid", "cname", IMPORTANCE_NONE);
mController.onResume(appRow, channel, null, null, null, null); mController.onResume(appRow, channel, null, null, null, null);

4
tests/robotests/src/com/android/settings/notification/app/ConversationListPreferenceControllerTest.java
View File

@@ -169,12 +169,12 @@ public class ConversationListPreferenceControllerTest {
ccw.setPkg("pkg"); ccw.setPkg("pkg");
ccw.setUid(1); ccw.setUid(1);
ShortcutInfo si = mock(ShortcutInfo.class); ShortcutInfo si = mock(ShortcutInfo.class);
when(si.getShortLabel()).thenReturn("conversation name"); when(si.getLabel()).thenReturn("conversation name");
ccw.setShortcutInfo(si); ccw.setShortcutInfo(si);
ccw.setGroupLabel("group"); ccw.setGroupLabel("group");
ccw.setParentChannelLabel("parent"); ccw.setParentChannelLabel("parent");
assertThat(mController.getTitle(ccw).toString()).isEqualTo(si.getShortLabel()); assertThat(mController.getTitle(ccw).toString()).isEqualTo(si.getLabel());
} }
@Test @Test