diff --git a/res/values/strings.xml b/res/values/strings.xml
index a4d830565ed..8685ad923ba 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6937,7 +6937,7 @@
}
- Multiple users
+ Users
Users & profiles
@@ -12440,6 +12440,8 @@
Allow multiple users
allow, multiple, user, permit, many
+
+ multiple, users, profiles, people, accounts, switch, many
Use wireless debugging
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 8dbb91cf506..083608dde3e 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/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;
diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
index a399e1771dd..5826ca25cc9 100644
--- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
+++ b/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 keysResultList = new ArrayList<>();
ShadowUserManager.getShadow().setSupportsMultipleUsers(true);
List rawData =