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

Merge changes from topic "b294333850-MailMail" into main

Browse Source 
* changes:
  Adds group to DND settings if channel names same
  aconfig flag for dnd app settings channels dedupe
This commit is contained in:
Alexander Roederer
2023-11-03 03:01:43 +00:00
committed by Android (Google) Code Review
parent 20826ab063 d44bfaf86f
commit 855307c73e
4 changed files with 85 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
tests/robotests/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceControllerTest.java
View File

@@ -26,16 +26,19 @@ import android.app.NotificationChannelGroup;
import android.app.NotificationManager;
import android.content.Context;
import android.content.pm.ParceledListSlice;
import android.platform.test.flag.junit.SetFlagsRule;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.flags.Flags;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.PrimarySwitchPreference;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -51,6 +54,9 @@ import java.util.Collections;
@LooperMode(LooperMode.Mode.LEGACY)
public class AppChannelsBypassingDndPreferenceControllerTest {
@Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@Mock
private NotificationBackend mBackend;
@@ -150,4 +156,44 @@ public class AppChannelsBypassingDndPreferenceControllerTest {
}
return new ParceledListSlice<>(Collections.singletonList(group));
}
@Test
public void displayPreference_duplicateChannelName_AddsGroupNameAsSummary() {
mSetFlagsRule.enableFlags(Flags.FLAG_DEDUPE_DND_SETTINGS_CHANNELS);
NotificationChannelGroup group1 = new NotificationChannelGroup("group1_id", "Group1");
NotificationChannelGroup group2 = new NotificationChannelGroup("group2_id", "Group2");
group1.addChannel(new NotificationChannel("mail_group1_id", "Mail",
NotificationManager.IMPORTANCE_DEFAULT));
group1.addChannel(new NotificationChannel("other_group1_id", "Other",
NotificationManager.IMPORTANCE_DEFAULT));
group2.addChannel(new NotificationChannel("music_group2_id", "Music",
NotificationManager.IMPORTANCE_DEFAULT));
// This channel has the same name as a channel in group1.
group2.addChannel(new NotificationChannel("mail_group2_id", "Mail",
NotificationManager.IMPORTANCE_DEFAULT));
ParceledListSlice<NotificationChannelGroup> groups = new ParceledListSlice<>(
new ArrayList<NotificationChannelGroup>() {
{
add(group1);
add(group2);
}
}
);
when(mBackend.getGroups(eq(mAppRow.pkg), eq(mAppRow.uid))).thenReturn(groups);
mController.displayPreference(mPreferenceScreen);
ShadowApplication.runBackgroundTasks();
// Check that we've added the group name as a summary to channels that have identical names.
// Channels are also alphabetized.
assertThat(mCategory.getPreference(1).getTitle().toString()).isEqualTo("Mail");
assertThat(mCategory.getPreference(1).getSummary().toString()).isEqualTo("Group1");
assertThat(mCategory.getPreference(2).getTitle().toString()).isEqualTo("Mail");
assertThat(mCategory.getPreference(2).getSummary().toString()).isEqualTo("Group2");
assertThat(mCategory.getPreference(3).getTitle().toString()).isEqualTo("Music");
assertThat(mCategory.getPreference(4).getTitle().toString()).isEqualTo("Other");
}
}