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

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

Merge "Eliminate duplicate keys in pref xmls."

parents 752928ed 57ef92a8

res/xml/accessibility_settings.xml

+6 −5
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ 
            android:title="@string/title_font_size" />



        <com.android.settings.display.ScreenZoomPreference

                android:key="screen_zoom"

            android:key="accessibility_settings_screen_zoom"

            android:fragment="com.android.settings.display.ScreenZoomSettings"

            android:title="@string/screen_zoom_title" />



        <Preference

res/xml/device_info_settings.xml

+0 −8
Original line number Diff line number Diff line
@@ -18,14 +18,6 @@ 
        android:key="device_info_pref_screen"

        android:title="@string/about_settings">



        <!-- System update settings - launches activity -->

        <Preference android:key="additional_system_update_settings"

                    android:title="@string/additional_system_update_settings_list_item_title">

            <intent android:action="android.intent.action.MAIN"

                    android:targetPackage="@string/additional_system_update"

                    android:targetClass="@string/additional_system_update_menu" />

        </Preference>



        <!-- Device status - launches activity -->

        <Preference android:key="status_info"

                android:title="@string/device_status"

res/xml/display_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -79,8 +79,9 @@ 
        settings:keywords="@string/keywords_display_font_size" />



    <com.android.settings.display.ScreenZoomPreference

        android:key="screen_zoom"

        android:key="display_settings_screen_zoom"

        android:title="@string/screen_zoom_title"

        android:fragment="com.android.settings.display.ScreenZoomSettings"

        settings:keywords="@string/screen_zoom_keywords" />



    <Preference

res/xml/security_lockscreen_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
        android:summary="@string/summary_placeholder" />



    <com.android.settingslib.RestrictedSwitchPreference

        android:key="add_users_when_locked"

        android:key="security_lockscreen_add_users_when_locked"

        android:title="@string/user_add_on_lockscreen_menu" />



    <com.android.settingslib.RestrictedPreference

res/xml/security_settings_misc.xml

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
        android:summary="@string/switch_off_text"

        android:fragment="com.android.settings.ScreenPinningSettings"/>



    <Preference android:key="usage_access"

    <Preference android:key="security_misc_usage_access"

        android:title="@string/usage_access_title"

        android:fragment="com.android.settings.applications.manageapplications.ManageApplications">

        <extra