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

Revert "Revert "Wiring for displaying managed profiles""

Browse Source 
This reverts commit 91e3f72569.

Will wait until related commit is in to submit this.

Bug: 13756871
Change-Id: I34642998adb71f44de1e529cc214ac4f921932ed
This commit is contained in:
Alexandra Gherghina
2014-04-23 10:56:37 +00:00
parent 1502fba4be
commit 423bafccbc
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -639,11 +639,23 @@ public class UserSettings extends RestrictedSettingsFragment
pref.setTitle(user.name);
}
if (!isInitialized(user)) {
pref.setSummary(user.isRestricted()
? R.string.user_summary_restricted_not_set_up
: R.string.user_summary_not_set_up);
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);
}
} 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) {