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

Commit b6fcba73 authored by Doris Ling's avatar Doris Ling Committed by Android (Google) Code Review
Browse files

Merge "Update preference title for add user on lock screen."

parents 358eab0f 3c67adb8

res/values/strings.xml

+2 −4
Original line number Diff line number Diff line
@@ -5585,10 +5585,8 @@ 
    <string name="user_remove_user_menu">Delete <xliff:g id="user_name">%1$s</xliff:g> from this device</string>

    <!-- User lock screen settings header[CHAR LIMIT=40] -->

    <string name="user_lockscreen_settings">Lock screen settings</string>

    <!-- User settings item to allow creating new users from locks creen [CHAR LIMIT=40] -->

    <string name="user_add_on_lockscreen_menu">Add users</string>

    <!-- User settings user_add_on_lockscreen_menu item summary [CHAR LIMIT=40] -->

    <string name="user_add_on_lockscreen_menu_summary">when device is locked</string>

    <!-- User settings item to allow creating new users from locks screen [CHAR LIMIT=50] -->

    <string name="user_add_on_lockscreen_menu">Add users from lock screen</string>

    <!-- User details new user name [CHAR LIMIT=30] -->

    <string name="user_new_user_name">New user</string>

    <!-- User details new restricted profile name [CHAR LIMIT=30] -->

res/xml/user_and_accounts_settings.xml

+0 −2
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ 
    <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"

        settings:useAdditionalSummary="true"

        android:order="105"/>



    <PreferenceCategory

res/xml/user_settings.xml

+1 −3
Original line number Diff line number Diff line
@@ -33,9 +33,7 @@ 
            android:title="@string/user_lockscreen_settings">

        <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"

                settings:useAdditionalSummary="true" />

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

    </PreferenceCategory>

    <Preference

        android:key="emergency_info"