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

Merge "Revert "Wiring for displaying managed profiles""

Browse Source
This commit is contained in:
Alexandra Gherghina
2014-04-23 10:55:51 +00:00
committed by Android (Google) Code Review
parent 5e76b65dcf 91e3f72569
commit 400899efa5
2 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/users/UserSettings.java
View File

@@ -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) {