From 91e3f7256935f1c805878c3a5241b9e5b9a67e44 Mon Sep 17 00:00:00 2001
From: Alexandra Gherghina <alexgherghina@google.com>
Date: Wed, 23 Apr 2014 10:51:53 +0000
Subject: [PATCH] Revert "Wiring for displaying managed profiles"

This reverts commit a044235272d5319ed3b1dd1aebc051b88ec69c1a.

This depended on CL: https://googleplex-android-review.googlesource.com/#/q/I2907b182e19b3562592da688b3f68ef5f4088557 which was not commited yet.

Bug: 13756871
Change-Id: Ib05c58002a06c7882c4b6dfd750c9681ff4b1646
---
 res/values/strings.xml                         | 10 ++--------
 .../android/settings/users/UserSettings.java   | 18 +++---------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3e73586ea09..7ad8f8ea449 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3866,7 +3866,7 @@
     <!-- Text spoken by the TTS engine as an example if the engine doesn't provide sample text [CHAR LIMIT=100] -->
     <string name="tts_default_sample_string">This is an example of speech synthesis</string>
     <!-- On main TTS Settings screen, title of a field explaining current TTS engine status for
-     current default language [CHAR LIMIT=50] -->
+	 current default language [CHAR LIMIT=50] -->
     <string name="tts_status_title">Default language status</string>
     <!-- On main TTS Settings screen, current TTS engine status for the current default language,
          selected language is fully supported by the engine [CHAR LIMIT=150]-->
@@ -3878,7 +3878,7 @@
          selected language is not supported by the engine [CHAR LIMIT=150] -->
     <string name="tts_status_not_supported"><xliff:g id="locale" example="English (United States)">%1$s</xliff:g> is not supported</string>
     <!-- On main TTS Settings screen, current TTS engine status for the current default language,
-         tts engine is queried for status [CHAR LIMIT=150] -->
+	 tts engine is queried for status [CHAR LIMIT=150] -->
     <string name="tts_status_checking">Checking...</string>
     <!-- On main TTS Settings screen, text for divider under which all TTS engines are listed -->
     <string name="tts_engines_section">Engines</string>
@@ -4772,10 +4772,6 @@
     <string name="user_add_user_menu">Add user or profile</string>
     <!-- User settings summary for a restricted profile [CHAR LIMIT=50] -->
     <string name="user_summary_restricted_profile">Restricted profile</string>
-    <!-- User settings summary for a managed profile [CHAR LIMIT=50] -->
-    <string name="user_summary_managed_profile">Managed profile</string>
-    <!-- User settings summary for an inactive managed profile [CHAR LIMIT=50] -->
-    <string name="user_summary_managed_profile_not_enabled">Managed profile (currently inactive)</string>
     <!-- User settings warning that restricted profile needs a screen lock [CHAR LIMIT=NONE] -->
     <string name="user_need_lock_message">Before you can create a restricted profile, you\'ll need to set up a screen lock to protect your apps and personal data.</string>
     <!-- User settings dialog button to set screen lock [CHAR LIMIT=25] -->
@@ -4784,8 +4780,6 @@
     <string name="user_summary_not_set_up">Not set up</string>
     <!-- User summary to indicate that restricted profile is currently not set up [CHAR LIMIT=100] -->
     <string name="user_summary_restricted_not_set_up">Not set up - Restricted profile</string>
-    <!-- User summary to indicate that a managed profile is currently not set up [CHAR LIMIT=100] -->
-    <string name="user_summary_managed_profile_not_set_up">Not set up - Managed profile</string>
     <!-- User information string to represent the owner of the device [CHAR LIMIT=25] -->
     <string name="user_owner">Owner</string>
     <!-- User settings title for current user entry "You" user. [CHAR LIMIT=30] -->
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) {