From 673bc9d01cc87632a0a5be2ddb5d18db06e06fb4 Mon Sep 17 00:00:00 2001 From: Bookatz Date: Mon, 17 Jun 2019 10:55:02 -0700 Subject: [PATCH] If cannot add restricted profile, don't suggest it Previously, on devices that cannot add a restricted profile (e.g. most phones), the Multiple users menu had an option to "Add user", whereas for devices that can, the option read "Add user or profile". Now it only says the latter, due to ag/6412347. We add back the original wording here. Fixes: 135294519 Test: manual confirmation on a phone that text says "Add user" Test: m -j ROBOTEST_FILTER=UserSettingsTest RunSettingsRoboTests Change-Id: Ia166b6ff9c69c0042e8a781be1146a5622177121 --- src/com/android/settings/users/UserSettings.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 98263e29af1..74e67149fda 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -271,6 +271,10 @@ public class UserSettings extends SettingsPreferenceFragment mMePreference.setSummary(R.string.user_admin); } mAddUser = (RestrictedPreference) findPreference(KEY_ADD_USER); + if (!mUserCaps.mCanAddRestrictedProfile) { + // Label should only mention adding a "user", not a "profile" + mAddUser.setTitle(R.string.user_add_user_menu); + } mAddUser.setOnPreferenceClickListener(this); activity.registerReceiverAsUser(