PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeff Sharkey
2012-09-19 14:52:33 -07:00
committed by Android (Google) Code Review
parent 185ba407ba 4420246a20
commit ee9ecf0ac6
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/bools.xml
View File

@@ -30,9 +30,6 @@
Can be overridden for specific product builds. --> Can be overridden for specific product builds. -->
<bool name="auto_confirm_bluetooth_activation_dialog">false</bool> <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 --> <!-- Whether to show a preference item for regulatory information in About phone -->
<bool name="config_show_regulatory_info">false</bool> <bool name="config_show_regulatory_info">false</bool>
</resources> </resources>

3
src/com/android/settings/Settings.java
View File

@@ -42,6 +42,7 @@ import android.os.INetworkManagementService;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
import android.preference.PreferenceActivity.Header; import android.preference.PreferenceActivity.Header;
@@ -415,7 +416,7 @@ public class Settings extends PreferenceActivity
i = insertAccountsHeaders(target, headerIndex); i = insertAccountsHeaders(target, headerIndex);
} else if (id == R.id.user_settings) { } else if (id == R.id.user_settings) {
if (!UserHandle.MU_ENABLED if (!UserHandle.MU_ENABLED
|| !getResources().getBoolean(R.bool.enable_user_management) || !UserManager.supportsMultipleUsers()
|| Utils.isMonkeyRunning()) { || Utils.isMonkeyRunning()) {
target.remove(header); target.remove(header);
} }