From c007634df2557c6933f15b1dd335ab4c8bb2e36f Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Tue, 19 Dec 2017 10:08:13 -0800
Subject: [PATCH] Fix UniquePreferenceTest

Bug: 70638967
Test: atest UniquePreferenceTest
Change-Id: Idf06ccd9580d66c051f9b7c910c567f321da6cc5
---
 res/xml/zen_mode_behavior_settings.xml             |  2 +-
 res/xml/zen_mode_settings.xml                      |  5 +++--
 .../settings/core/UniquePreferenceTest.java        | 14 +++++++++++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/res/xml/zen_mode_behavior_settings.xml b/res/xml/zen_mode_behavior_settings.xml
index c0849daaf48..878332dc3d9 100644
--- a/res/xml/zen_mode_behavior_settings.xml
+++ b/res/xml/zen_mode_behavior_settings.xml
@@ -77,6 +77,6 @@
                           android:summary="@string/zen_mode_screen_off_summary" />
     </PreferenceCategory>
 
-    <com.android.settingslib.widget.FooterPreference/>
+    <com.android.settingslib.widget.FooterPreference />
 
 </PreferenceScreen>
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index 0a6284d0b7c..ca8ad10f227 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -41,8 +41,9 @@
             android:layout="@layout/zen_mode_settings_button" />
     </PreferenceCategory>
 
-    <PreferenceCategory>
-        <com.android.settingslib.widget.FooterPreference/>
+    <PreferenceCategory
+        android:key="zen_mode_footer_container">
+        <com.android.settingslib.widget.FooterPreference />
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
index ce3fe011910..36865a4e2a5 100644
--- a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
+++ b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
@@ -54,6 +54,8 @@ import java.util.Set;
 public class UniquePreferenceTest {
 
     private static final String TAG = "UniquePreferenceTest";
+    private static final List<String> IGNORE_PREF_TYPES = Arrays.asList(
+            "com.android.settingslib.widget.FooterPreference");
     private static final List<String> SUPPORTED_PREF_TYPES = Arrays.asList(
             "Preference", "PreferenceCategory", "PreferenceScreen");
     private static final List<String> WHITELISTED_DUPLICATE_KEYS = Arrays.asList(
@@ -63,8 +65,15 @@ public class UniquePreferenceTest {
                                             // should be formed as one single xml and this entry
                                             // should be removed.
 
-            "dashboard_tile_placeholder"    // This is the placeholder pref for injecting dynamic
+            "dashboard_tile_placeholder",   // This is the placeholder pref for injecting dynamic
                                             // tiles.
+            // Dup keys from connected device page experiment.
+            "usb_mode",
+            "connected_devices_screen",
+            "toggle_bluetooth",
+            "toggle_nfc",
+            "android_beam_settings",
+            "sms_mirroring"
     );
 
     private Context mContext;
@@ -158,6 +167,9 @@ public class UniquePreferenceTest {
                     continue;
                 }
                 final String nodeName = parser.getName();
+                if (IGNORE_PREF_TYPES.contains(nodeName)) {
+                    continue;
+                }
                 if (!SUPPORTED_PREF_TYPES.contains(nodeName) && !nodeName.endsWith("Preference")) {
                     continue;
                 }