From 3c67adb804cf596cdf85439b50f2487c7a68ba29 Mon Sep 17 00:00:00 2001
From: Doris Ling <dling@google.com>
Date: Wed, 15 Feb 2017 11:19:02 -0800
Subject: [PATCH] Update preference title for add user on lock screen.

In Settings->User & accounts, update the preference title for "Add user"
to "Add users from lock screen" and remove the summary.

Bug: 34976320
Test: Visual
Change-Id: Idfb661537ac3b178ca20c2da9e66ab8a16567ba6
---
 res/values/strings.xml                 | 6 ++----
 res/xml/user_and_accounts_settings.xml | 2 --
 res/xml/user_settings.xml              | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 852e81d94f1..c1fb3e35bed 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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] -->
diff --git a/res/xml/user_and_accounts_settings.xml b/res/xml/user_and_accounts_settings.xml
index 9bb39f6385f..bc3ac6c4bbf 100644
--- a/res/xml/user_and_accounts_settings.xml
+++ b/res/xml/user_and_accounts_settings.xml
@@ -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
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index 1375ed4f184..45d0b90182e 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -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"