Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 442c929b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove aconfig flag `dedupe_dnd_settings_channels`." into main

parents 61950ff4 667c04d6

aconfig/settings_notification_flag_declarations.aconfig

+0 −6
Original line number Diff line number Diff line 
package: "com.android.settings.flags"

container: "system_ext"



flag {

  name: "dedupe_dnd_settings_channels"

  namespace: "systemui"

  description: "Controls adding group names to channel names in the DND>Apps settings page"

  bug: "294333850"

}

src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java

+14 −18
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ public class AppChannelsBypassingDndPreferenceController extends NotificationPre 
                    for (NotificationChannel channel : channelGroup.getChannels()) {

                        if (!isConversation(channel)) {

                            newChannelList.add(channel);

                            if (Flags.dedupeDndSettingsChannels()) {

                            mChannelGroupNames.put(channel, channelGroup.getName().toString());

                            // Check if channel name is unique on this page; if not, save it.

                            if (allChannelNames.contains(channel.getName())) {
@@ -159,7 +158,6 @@ public class AppChannelsBypassingDndPreferenceController extends NotificationPre 
                        }

                    }

                }

                }

                Collections.sort(newChannelList, CHANNEL_COMPARATOR);

                mChannels = newChannelList;

                return null;
@@ -190,7 +188,6 @@ public class AppChannelsBypassingDndPreferenceController extends NotificationPre 
                            && isChannelConfigurable(channel)

                            && showNotification(channel));

            channelPreference.setTitle(BidiFormatter.getInstance().unicodeWrap(channel.getName()));

            if (Flags.dedupeDndSettingsChannels()) {

            // If the channel shares its name with another channel, set group name as summary

            // to disambiguate in the list.

            if (mDuplicateChannelNames.contains(channel.getName().toString())
@@ -200,7 +197,6 @@ public class AppChannelsBypassingDndPreferenceController extends NotificationPre 
                channelPreference.setSummary(BidiFormatter.getInstance().unicodeWrap(

                        mChannelGroupNames.get(channel)));

            }

            }

            channelPreference.setChecked(showNotificationInDnd(channel));

            channelPreference.setOnPreferenceChangeListener(

                    new Preference.OnPreferenceChangeListener() {

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

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ public class AppChannelsBypassingDndPreferenceControllerTest { 


    @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");