Merge "Rename Multiple users page to Users" into main

res/values/strings.xml

@@ -6937,7 +6937,7 @@
     }</string>
 
     <!-- User settings screen title [CHAR LIMIT=40] -->
-    <string name="user_settings_title">Multiple users</string>
+    <string name="user_settings_title">Users</string>
 
     <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
     <string name="user_list_title">Users &amp; profiles</string>
@@ -12440,6 +12440,8 @@
     <string name="multiple_users_main_switch_title">Allow multiple users</string>
     <!-- Search keywords for the "Allow Multiple Users" section in Multiple Users Screen. [CHAR LIMIT=NONE] -->
     <string name="multiple_users_main_switch_keywords">allow, multiple, user, permit, many</string>
+    <!-- Search keywords for the Users Screen. [CHAR LIMIT=NONE] -->
+    <string name="multiple_users_title_keywords">multiple, users, profiles, people, accounts, switch, many</string>
 
     <!-- Title for wireless debugging main switch. [CHAR LIMIT=50] -->
     <string name="wireless_debugging_main_switch_title">Use wireless debugging</string>

src/com/android/settings/users/UserSettings.java

@@ -138,6 +138,7 @@ public class UserSettings extends SettingsPreferenceFragment
     private static final String KEY_REMOVE_GUEST_ON_EXIT = "remove_guest_on_exit";
     private static final String KEY_GUEST_USER_CATEGORY = "guest_user_category";
     private static final String KEY_ALLOW_MULTIPLE_USERS = "allow_multiple_users";
+    private static final String KEY_USER_SETTINGS_SCREEN = "user_settings_screen";
 
     private static final String SETTING_GUEST_HAS_LOGGED_IN = "systemui.guest_has_logged_in";
 
@@ -1740,6 +1741,16 @@ public class UserSettings extends SettingsPreferenceFragment
                         return rawData;
                     }
 
+                    SearchIndexableRaw multipleUsersData = new SearchIndexableRaw(context);
+                    multipleUsersData.key = KEY_USER_SETTINGS_SCREEN;
+                    multipleUsersData.title =
+                            context.getString(R.string.user_settings_title);
+                    multipleUsersData.keywords =
+                            context.getString(R.string.multiple_users_title_keywords);
+                    multipleUsersData.screenTitle =
+                            context.getString(R.string.user_settings_title);
+                    rawData.add(multipleUsersData);
+
                     SearchIndexableRaw allowMultipleUsersResult = new SearchIndexableRaw(context);
 
                     allowMultipleUsersResult.key = KEY_ALLOW_MULTIPLE_USERS;

tests/robotests/src/com/android/settings/users/UserSettingsTest.java

@@ -104,6 +104,7 @@ public class UserSettingsTest {
 
     private static final String KEY_USER_GUEST = "user_guest";
     private static final String KEY_ALLOW_MULTIPLE_USERS = "allow_multiple_users";
+    private static final String KEY_USER_SETTINGS_SCREEN = "user_settings_screen";
     private static final int ACTIVE_USER_ID = 0;
     private static final int INACTIVE_ADMIN_USER_ID = 1;
     private static final int INACTIVE_SECONDARY_USER_ID = 14;
@@ -211,7 +212,7 @@ public class UserSettingsTest {
 
     @Test
     public void testGetRawDataToIndex_returnAllIndexablePreferences() {
-        String[] expectedKeys = {KEY_ALLOW_MULTIPLE_USERS};
+        String[] expectedKeys = {KEY_ALLOW_MULTIPLE_USERS, KEY_USER_SETTINGS_SCREEN};
         List<String> keysResultList = new ArrayList<>();
         ShadowUserManager.getShadow().setSupportsMultipleUsers(true);
         List<SearchIndexableRaw> rawData =