Merge "If cannot add restricted profile, don't suggest it" into qt-dev

am: a5018be48a

Change-Id: I76b1faf3e21f5b552ef3ad80660dee0786234d15

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(