Loading res/values/strings.xml +2 −3 Original line number Diff line number Diff line Loading @@ -7657,8 +7657,7 @@ <string name="user_you">You (<xliff:g id="name" example="Name">%s</xliff:g>)</string> <!-- Summary for add user action, when it's disabled [CHAR LIMIT=100] --> <string name="user_add_max_count">You can add up to <xliff:g id="user_count">%1$d</xliff:g> users</string> <string name="user_add_max_count">You can\u2019t add any more users. Remove a user to add a new one.</string> <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] --> <string name="user_cannot_manage_message" product="tablet">Only the tablet\u2019s owner can manage users.</string> Loading Loading @@ -13712,7 +13711,7 @@ <!-- Title for default print service main switch. [CHAR LIMIT=50] --> <string name="default_print_service_main_switch_title">Use print service</string> <!-- Title for multiple users main switch. [CHAR LIMIT=50] --> <string name="multiple_users_main_switch_title">Enable multiple users</string> <string name="multiple_users_main_switch_title">Allow multiple users</string> <!-- Title for wireless debugging main switch. [CHAR LIMIT=50] --> <string name="wireless_debugging_main_switch_title">Use wireless debugging</string> <!-- Title for graphics driver main switch. [CHAR LIMIT=50] --> src/com/android/settings/users/UserSettings.java +1 −2 Original line number Diff line number Diff line Loading @@ -1199,8 +1199,7 @@ public class UserSettings extends SettingsPreferenceFragment addUser.setEnabled(canAddMoreUsers && !mAddingUser && canSwitchUserNow()); if (!canAddMoreUsers) { addUser.setSummary( getString(R.string.user_add_max_count, getRealUsersCount())); addUser.setSummary(getString(R.string.user_add_max_count)); } else { addUser.setSummary(null); } Loading tests/robotests/src/com/android/settings/users/UserSettingsTest.java +2 −1 Original line number Diff line number Diff line Loading @@ -354,7 +354,8 @@ public class UserSettingsTest { mFragment.updateUserList(); verify(mAddUserPreference).setVisible(true); verify(mAddUserPreference).setSummary("You can add up to 4 users"); verify(mAddUserPreference).setSummary( "You can\u2019t add any more users. Remove a user to add a new one."); verify(mAddUserPreference).setEnabled(false); verify(mAddUserPreference).setSelectable(true); } Loading Loading
res/values/strings.xml +2 −3 Original line number Diff line number Diff line Loading @@ -7657,8 +7657,7 @@ <string name="user_you">You (<xliff:g id="name" example="Name">%s</xliff:g>)</string> <!-- Summary for add user action, when it's disabled [CHAR LIMIT=100] --> <string name="user_add_max_count">You can add up to <xliff:g id="user_count">%1$d</xliff:g> users</string> <string name="user_add_max_count">You can\u2019t add any more users. Remove a user to add a new one.</string> <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] --> <string name="user_cannot_manage_message" product="tablet">Only the tablet\u2019s owner can manage users.</string> Loading Loading @@ -13712,7 +13711,7 @@ <!-- Title for default print service main switch. [CHAR LIMIT=50] --> <string name="default_print_service_main_switch_title">Use print service</string> <!-- Title for multiple users main switch. [CHAR LIMIT=50] --> <string name="multiple_users_main_switch_title">Enable multiple users</string> <string name="multiple_users_main_switch_title">Allow multiple users</string> <!-- Title for wireless debugging main switch. [CHAR LIMIT=50] --> <string name="wireless_debugging_main_switch_title">Use wireless debugging</string> <!-- Title for graphics driver main switch. [CHAR LIMIT=50] -->
src/com/android/settings/users/UserSettings.java +1 −2 Original line number Diff line number Diff line Loading @@ -1199,8 +1199,7 @@ public class UserSettings extends SettingsPreferenceFragment addUser.setEnabled(canAddMoreUsers && !mAddingUser && canSwitchUserNow()); if (!canAddMoreUsers) { addUser.setSummary( getString(R.string.user_add_max_count, getRealUsersCount())); addUser.setSummary(getString(R.string.user_add_max_count)); } else { addUser.setSummary(null); } Loading
tests/robotests/src/com/android/settings/users/UserSettingsTest.java +2 −1 Original line number Diff line number Diff line Loading @@ -354,7 +354,8 @@ public class UserSettingsTest { mFragment.updateUserList(); verify(mAddUserPreference).setVisible(true); verify(mAddUserPreference).setSummary("You can add up to 4 users"); verify(mAddUserPreference).setSummary( "You can\u2019t add any more users. Remove a user to add a new one."); verify(mAddUserPreference).setEnabled(false); verify(mAddUserPreference).setSelectable(true); } Loading