diff --git a/res/values/strings.xml b/res/values/strings.xml
index ad5c01d731a..dd980f9567b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3868,7 +3868,7 @@
This is an example of speech synthesis
+ current default language [CHAR LIMIT=50] -->
Default language status
@@ -3880,7 +3880,7 @@
selected language is not supported by the engine [CHAR LIMIT=150] -->
%1$s is not supported
+ tts engine is queried for status [CHAR LIMIT=150] -->
Checking...
Engines
@@ -4779,10 +4779,6 @@
Add user or profile
Restricted profile
-
- Managed profile
-
- Managed profile (currently inactive)
Before you can create a restricted profile, you\'ll need to set up a screen lock to protect your apps and personal data.
@@ -4791,8 +4787,6 @@
Not set up
Not set up - Restricted profile
-
- Not set up - Managed profile
Owner
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index ff8b9eb206b..d8213ff1550 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -639,23 +639,11 @@ public class UserSettings extends RestrictedSettingsFragment
pref.setTitle(user.name);
}
if (!isInitialized(user)) {
- if (user.isRestricted()) {
- pref.setSummary(R.string.user_summary_restricted_not_set_up);
- } else if (user.isManagedProfile()) {
- pref.setSummary(R.string.user_summary_managed_profile_not_set_up);
- } else {
- pref.setSummary(R.string.user_summary_not_set_up);
- }
+ pref.setSummary(user.isRestricted()
+ ? R.string.user_summary_restricted_not_set_up
+ : R.string.user_summary_not_set_up);
} else if (user.isRestricted()) {
pref.setSummary(R.string.user_summary_restricted_profile);
- } else if (user.isManagedProfile()) {
- DevicePolicyManager dpm = (DevicePolicyManager)
- getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
- if (dpm.isProfileEnabled(user.id)) {
- pref.setSummary(R.string.user_summary_managed_profile);
- } else {
- pref.setSummary(R.string.user_summary_managed_profile_not_enabled);
- }
}
if (user.iconPath != null) {
if (mUserIcons.get(user.id) == null) {