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

Commit 6dca5ef8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix doubling of channel listing"

parents 2195fd72 0b6d652d

src/com/android/settings/notification/AppNotificationSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ public class AppNotificationSettings extends NotificationSettingsBase { 
                int childCount = groupGroup.getPreferenceCount();

                for (int i = 0; i < childCount; i++) {

                    Preference pref = groupGroup.getPreference(i);

                    if (pref instanceof MasterCheckBoxPreference) {

                    if (pref instanceof ChannelSummaryPreference) {

                        toRemove.add(pref);

                    }

                }

src/com/android/settings/notification/NotificationSettingsBase.java

+3 −1
Original line number Diff line number Diff line
@@ -309,7 +309,9 @@ abstract public class NotificationSettingsBase extends DashboardFragment { 
                        return true;

                    }

                });

        if (parent.findPreference(channelPref.getKey()) == null) {

            parent.addPreference(channelPref);

        }

        return channelPref;

    }