commit a33ee8b3492fb81de26cbd749066ee1d68aaf9d6
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 14 17:22:55 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 14 17:22:55 2018 +0000
tree b25adf16b834bc3aa3349ef57bad73b40697e8ad
parent 03017fc928da91667778dbe0051a0216f0cd5a99
parent d2e33e73a16973926d52858b7a92281a9c90b15f

Merge "Fix instrumentation tests"

res/xml/accessibility_vibration_settings.xml

diff --git a/res/xml/accessibility_vibration_settings.xml b/res/xml/accessibility_vibration_settings.xml
index d61454d..17468ea 100644
--- a/res/xml/accessibility_vibration_settings.xml
+++ b/res/xml/accessibility_vibration_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:key="accessibility_settings_screen"
+        android:key="accessibility_settings_vibration_screen"
         android:title="@string/accessibility_vibration_settings_title"
         android:persistent="true">
 

tests/unit/src/com/android/settings/core/UniquePreferenceTest.java

diff --git a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
index aa1b55f..dd27591 100644
--- a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
+++ b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
@@ -90,7 +90,16 @@
             "imei_info",
             "wifi_ip_address",
             "wifi_mac_address",
-            "safety_info"
+            "safety_info",
+            // Dupe keys from data usage v2.
+            "data_usage_screen",
+            "cellular_data_usage",
+            "data_usage_wifi_screen",
+            "status_header",
+            "billing_preference",
+            "data_usage_cellular_screen",
+            "wifi_data_usage",
+            "data_usage_enable"
     );
 
     private Context mContext;