PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix instrumentation tests"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-14 17:22:55 +00:00
committed by Android (Google) Code Review
parent 03017fc928 d2e33e73a1
commit a33ee8b349
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/accessibility_vibration_settings.xml
View File

@@ -15,7 +15,7 @@
--> -->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <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:title="@string/accessibility_vibration_settings_title"
android:persistent="true"> android:persistent="true">

11
tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
View File

@@ -90,7 +90,16 @@ public class UniquePreferenceTest {
"imei_info", "imei_info",
"wifi_ip_address", "wifi_ip_address",
"wifi_mac_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; private Context mContext;