From 4420246a2003d25c0dc82387a6e72e157e2125d6 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Wed, 19 Sep 2012 13:13:45 -0700
Subject: [PATCH] Migrate UI to supportsMultipleUsers().

Bug: 7194531
Change-Id: I601340362053cfd7394dea0fa69bd0523303070b
---
 res/values/bools.xml                   | 3 ---
 src/com/android/settings/Settings.java | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/res/values/bools.xml b/res/values/bools.xml
index ba402e5982d..76dc44a7a7e 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -30,9 +30,6 @@
          Can be overridden for specific product builds. -->
     <bool name="auto_confirm_bluetooth_activation_dialog">false</bool>
 
-    <!-- Whether User management screen is available -->
-    <bool name="enable_user_management">false</bool>
-
     <!-- Whether to show a preference item for regulatory information in About phone -->
     <bool name="config_show_regulatory_info">false</bool>
 </resources>
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index bf31386b47e..fa30f09e147 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -42,6 +42,7 @@ import android.os.INetworkManagementService;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceActivity.Header;
@@ -415,7 +416,7 @@ public class Settings extends PreferenceActivity
                 i = insertAccountsHeaders(target, headerIndex);
             } else if (id == R.id.user_settings) {
                 if (!UserHandle.MU_ENABLED
-                        || !getResources().getBoolean(R.bool.enable_user_management)
+                        || !UserManager.supportsMultipleUsers()
                         || Utils.isMonkeyRunning()) {
                     target.remove(header);
                 }