From 04d50c97098a249c7573e89948f2bb6a155ff2e8 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Wed, 20 May 2020 14:23:43 -0400
Subject: [PATCH] Switch from shortlabel to label

Test: atest
Bug: 157140669
Change-Id: Iebcb2f076fef33b6f3ce16326af4e4c5c6770459
---
 .../app/AppConversationListPreferenceController.java        | 2 +-
 .../app/ConversationHeaderPreferenceController.java         | 2 +-
 .../app/ConversationListPreferenceController.java           | 6 +++---
 .../app/ConversationHeaderPreferenceControllerTest.java     | 4 ++--
 .../app/ConversationListPreferenceControllerTest.java       | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/com/android/settings/notification/app/AppConversationListPreferenceController.java b/src/com/android/settings/notification/app/AppConversationListPreferenceController.java
index 0ba943605a5..364a81c4821 100644
--- a/src/com/android/settings/notification/app/AppConversationListPreferenceController.java
+++ b/src/com/android/settings/notification/app/AppConversationListPreferenceController.java
@@ -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,
diff --git a/src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java b/src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java
index c74b032b4cb..50a8b23a554 100644
--- a/src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java
+++ b/src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java
@@ -124,7 +124,7 @@ public class ConversationHeaderPreferenceController extends NotificationPreferen
     @VisibleForTesting
     CharSequence getLabel() {
         return mConversationInfo != null
-                ? mConversationInfo.getShortLabel()
+                ? mConversationInfo.getLabel()
                 : mChannel.getName();
     }
 }
diff --git a/src/com/android/settings/notification/app/ConversationListPreferenceController.java b/src/com/android/settings/notification/app/ConversationListPreferenceController.java
index b750a66efa2..57cbe6a4ad7 100644
--- a/src/com/android/settings/notification/app/ConversationListPreferenceController.java
+++ b/src/com/android/settings/notification/app/ConversationListPreferenceController.java
@@ -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());
                 }
             };
 }
diff --git a/tests/robotests/src/com/android/settings/notification/app/ConversationHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/ConversationHeaderPreferenceControllerTest.java
index 96f4e0bf497..428a1a8fc43 100644
--- a/tests/robotests/src/com/android/settings/notification/app/ConversationHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/ConversationHeaderPreferenceControllerTest.java
@@ -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);
diff --git a/tests/robotests/src/com/android/settings/notification/app/ConversationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/ConversationListPreferenceControllerTest.java
index cbd911541a0..8672afb0617 100644
--- a/tests/robotests/src/com/android/settings/notification/app/ConversationListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/ConversationListPreferenceControllerTest.java
@@ -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