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

6
res/values/strings.xml
View File

@@ -4779,6 +4779,10 @@
<string name="user_add_user_menu">Add user or profile</string> <string name="user_add_user_menu">Add user or profile</string>
<!-- User settings summary for a restricted profile [CHAR LIMIT=50] --> <!-- User settings summary for a restricted profile [CHAR LIMIT=50] -->
<string name="user_summary_restricted_profile">Restricted profile</string> <string name="user_summary_restricted_profile">Restricted profile</string>
<!-- User settings summary for a managed profile [CHAR LIMIT=50] -->
<string name="user_summary_managed_profile">Managed profile</string>
<!-- User settings summary for an inactive managed profile [CHAR LIMIT=50] -->
<string name="user_summary_managed_profile_not_enabled">Managed profile (currently inactive)</string>
<!-- User settings warning that restricted profile needs a screen lock [CHAR LIMIT=NONE] --> <!-- User settings warning that restricted profile needs a screen lock [CHAR LIMIT=NONE] -->
<string name="user_need_lock_message">Before you can create a restricted profile, you\'ll need to set up a screen lock to protect your apps and personal data.</string> <string name="user_need_lock_message">Before you can create a restricted profile, you\'ll need to set up a screen lock to protect your apps and personal data.</string>
<!-- User settings dialog button to set screen lock [CHAR LIMIT=25] --> <!-- User settings dialog button to set screen lock [CHAR LIMIT=25] -->
@@ -4787,6 +4791,8 @@
<string name="user_summary_not_set_up">Not set up</string> <string name="user_summary_not_set_up">Not set up</string>
<!-- User summary to indicate that restricted profile is currently not set up [CHAR LIMIT=100] --> <!-- User summary to indicate that restricted profile is currently not set up [CHAR LIMIT=100] -->
<string name="user_summary_restricted_not_set_up">Not set up - Restricted profile</string> <string name="user_summary_restricted_not_set_up">Not set up - Restricted profile</string>
<!-- User summary to indicate that a managed profile is currently not set up [CHAR LIMIT=100] -->
<string name="user_summary_managed_profile_not_set_up">Not set up - Managed profile</string>
<!-- User information string to represent the owner of the device [CHAR LIMIT=25] --> <!-- User information string to represent the owner of the device [CHAR LIMIT=25] -->
<string name="user_owner">Owner</string> <string name="user_owner">Owner</string>
<!-- User settings title for current user entry "You" user. [CHAR LIMIT=30] --> <!-- User settings title for current user entry "You" user. [CHAR LIMIT=30] -->

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

@@ -639,11 +639,23 @@ public class UserSettings extends RestrictedSettingsFragment
pref.setTitle(user.name); pref.setTitle(user.name);
} }
if (!isInitialized(user)) { if (!isInitialized(user)) {
pref.setSummary(user.isRestricted() if (user.isRestricted()) {
? R.string.user_summary_restricted_not_set_up pref.setSummary(R.string.user_summary_restricted_not_set_up);
: R.string.user_summary_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()) { } else if (user.isRestricted()) {
pref.setSummary(R.string.user_summary_restricted_profile); 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 (user.iconPath != null) {
if (mUserIcons.get(user.id) == null) { if (mUserIcons.get(user.id) == null) {