Merge "Only show one copy of each preference" into oc-dev

am: 31de48193e Change-Id: Ic9b107c57e0db902e8a16c0054f533370c2f819d
2017-05-04 20:15:12 +00:00
parent 7d50d9db12 31de48193e
commit c265993528
1 changed files with 2 additions and 0 deletions
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -91,6 +91,8 @@ public class AppNotificationSettings extends NotificationSettingsBase {

        if (getPreferenceScreen() != null) {
            getPreferenceScreen().removeAll();
+            mChannelGroups.clear();
+            mShowLegacyChannelConfig = false;
        }

        addPreferencesFromResource(R.xml.app_notification_settings);