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 am: 6d63120295 am: 22ac6baf3d am: a98f5e1445 am: 25d1b428bf

Browse Source 
Change-Id: Iddbf702265aa3c17cdd7ad9997f2b76aa22d0b36
This commit is contained in:
Julia Reynolds
2020-05-21 20:11:16 +00:00
committed by Automerger Merge Worker
parent 06b722df8f 25d1b428bf
commit 75aba32e27
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,10 +103,10 @@ public class ConversationHeaderPreferenceControllerTest {
@Test
public void testGetLabel() {
ShortcutInfo si = mock(ShortcutInfo.class);
when(si.getShortLabel()).thenReturn("hello");
when(si.getLabel()).thenReturn("hello");
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
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);
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.setUid(1);
ShortcutInfo si = mock(ShortcutInfo.class);
when(si.getShortLabel()).thenReturn("conversation name");
when(si.getLabel()).thenReturn("conversation name");
ccw.setShortcutInfo(si);
ccw.setGroupLabel("group");
ccw.setParentChannelLabel("parent");
assertThat(mController.getTitle(ccw).toString()).isEqualTo(si.getShortLabel());
assertThat(mController.getTitle(ccw).toString()).isEqualTo(si.getLabel());
}
@Test