From fc730aa9473edee1bc4ad8b17c17cac11ad598df Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Thu, 4 May 2017 10:10:22 -0400
Subject: [PATCH] Only show one copy of each preference

Fixes: 37912144
Fixes: 37909560
Test: manual, load app settings for legacy and upgrade apps from
inline settings, click (i), and click back.

Change-Id: Ieb96cca03f2596fd44cd33facafa3d4af1fbc24d
---
 .../android/settings/notification/AppNotificationSettings.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index e91a8497706..20483844ffe 100644
--- 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);