Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a33ee8b3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix instrumentation tests"

parents 03017fc9 d2e33e73

res/xml/accessibility_vibration_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

+10 −1
Original line number Diff line number Diff line
@@ -90,7 +90,16 @@ public class UniquePreferenceTest { 
            "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;