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

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

Browse Source
This commit is contained in:
Doris Ling
2017-02-16 01:58:01 +00:00
committed by Android (Google) Code Review
parent 358eab0fff 3c67adb804
commit b6fcba73e7
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -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] -->

2
res/xml/user_and_accounts_settings.xml
View File

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

4
res/xml/user_settings.xml
View File

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