diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-09-19 14:52:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-19 14:52:34 -0700 |
| commit | ee9ecf0ac6695bc80ba4bc3256989c307f85fd1d (patch) | |
| tree | d9d654ad6c3c6f4b2d272bdf56e6bc59258b842e | |
| parent | 185ba407bab02c1442d02b82800f0220779ecb10 (diff) | |
| parent | 4420246a2003d25c0dc82387a6e72e157e2125d6 (diff) | |
| download | packages_apps_Settings-ee9ecf0ac6695bc80ba4bc3256989c307f85fd1d.zip packages_apps_Settings-ee9ecf0ac6695bc80ba4bc3256989c307f85fd1d.tar.gz packages_apps_Settings-ee9ecf0ac6695bc80ba4bc3256989c307f85fd1d.tar.bz2 | |
Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev
| -rw-r--r-- | res/values/bools.xml | 3 | ||||
| -rw-r--r-- | 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 ba402e5..76dc44a 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 bf31386..fa30f09 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); } |