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

Merge "Handle spanned conversation labels" into sc-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-08-13 04:11:04 +00:00
committed by Android (Google) Code Review
parent 2c0b7fdb90 2ffbb747d4
commit 1741d5d12c
2 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/notification/app/RecentConversationsPreferenceController.java
View File

@@ -233,8 +233,13 @@ public class RecentConversationsPreferenceController extends AbstractPreferenceC
private final Collator sCollator = Collator.getInstance();
@Override
public int compare(ConversationChannel o1, ConversationChannel o2) {
int labelComparison = sCollator.compare(o1.getShortcutInfo().getLabel(),
o2.getShortcutInfo().getLabel());
int labelComparison = 0;
if (o1.getShortcutInfo().getLabel() != null
&& o2.getShortcutInfo().getLabel() != null) {
labelComparison = sCollator.compare(
o1.getShortcutInfo().getLabel().toString(),
o2.getShortcutInfo().getLabel().toString());
}
if (labelComparison == 0) {
return o1.getNotificationChannel().getId().compareTo(

33
tests/robotests/src/com/android/settings/notification/app/RecentConversationsPreferenceControllerTest.java
View File

@@ -36,6 +36,7 @@ import android.content.pm.ShortcutInfo;
import android.os.Bundle;
import android.os.UserHandle;
import android.provider.Settings;
import android.text.SpannedString;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.LinearLayout;
@@ -338,4 +339,36 @@ public class RecentConversationsPreferenceControllerTest {
// one for the preference, none for 'clear all'
verify(outerContainer, times(1)).addPreference(any());
}
@Test
public void testSpans() {
ShortcutInfo si = mock(ShortcutInfo.class);
when(si.getLabel()).thenReturn(new SpannedString("hello"));
ConversationChannel ccw = new ConversationChannel(si, 6,
new NotificationChannel("hi", "hi", 4),
null, 7,
true /* hasactivenotifs */);
ShortcutInfo si2 = mock(ShortcutInfo.class);
when(si2.getLabel()).thenReturn("hello");
ConversationChannel ccw2 = new ConversationChannel(si2, 6,
new NotificationChannel("hi2", "hi2", 4),
null, 7,
true /* hasactivenotifs */);
// no crash
mController.mConversationComparator.compare(ccw, ccw2);
}
@Test
public void testNullSpans() {
ConversationChannel ccw = new ConversationChannel(mock(ShortcutInfo.class), 6,
new NotificationChannel("hi", "hi", 4),
null, 7,
true /* hasactivenotifs */);
ConversationChannel ccw2 = new ConversationChannel(mock(ShortcutInfo.class), 6,
new NotificationChannel("hi2", "hi2", 4),
null, 7,
true /* hasactivenotifs */);
// no crash
mController.mConversationComparator.compare(ccw, ccw2);
}
}