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

Commit cdb089c9 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Add additional summaries for some restricted switch preferences." into nyc-dev

parents 29d59dd2 415bd9ec

res/xml/security_settings_misc.xml

+4 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

        android:title="@string/security_settings_title">



    <PreferenceCategory android:key="sim_lock"
@@ -54,7 +55,8 @@ 
        <com.android.settingslib.RestrictedSwitchPreference android:key="toggle_install_applications"

                android:title="@string/install_applications"

                android:summaryOff="@string/install_unknown_applications"

                android:summaryOn="@string/install_unknown_applications" />

                android:summaryOn="@string/install_unknown_applications"

                settings:useAdditionalSummary="true" />



    </PreferenceCategory>

res/xml/user_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ 
        <com.android.settingslib.RestrictedSwitchPreference

                android:key="add_users_when_locked"

                android:title="@string/user_add_on_lockscreen_menu"

                android:summary="@string/user_add_on_lockscreen_menu_summary" />

                android:summary="@string/user_add_on_lockscreen_menu_summary"

                settings:useAdditionalSummary="true" />

    </PreferenceCategory>

    <Preference

        android:key="emergency_info"