Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev

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>

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);
                 }