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

Wiring for displaying managed profiles

Browse Source 
Bug: 13756871
Change-Id: I81898e3b32baa0bc9ec72258b3bd470102d42b68
This commit is contained in:
Alexandra Gherghina
2014-04-14 17:24:51 +01:00
parent 71a2ef3e7c
commit a044235272
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/values/strings.xml
View File

@@ -3866,7 +3866,7 @@
<!-- Text spoken by the TTS engine as an example if the engine doesn't provide sample text [CHAR LIMIT=100] -->
<string name="tts_default_sample_string">This is an example of speech synthesis</string>
<!-- On main TTS Settings screen, title of a field explaining current TTS engine status for
current default language [CHAR LIMIT=50] -->
current default language [CHAR LIMIT=50] -->
<string name="tts_status_title">Default language status</string>
<!-- On main TTS Settings screen, current TTS engine status for the current default language,
selected language is fully supported by the engine [CHAR LIMIT=150]-->
@@ -3878,7 +3878,7 @@
selected language is not supported by the engine [CHAR LIMIT=150] -->
<string name="tts_status_not_supported"><xliff:g id="locale" example="English (United States)">%1$s</xliff:g> is not supported</string>
<!-- On main TTS Settings screen, current TTS engine status for the current default language,
tts engine is queried for status [CHAR LIMIT=150] -->
tts engine is queried for status [CHAR LIMIT=150] -->
<string name="tts_status_checking">Checking...</string>
<!-- On main TTS Settings screen, text for divider under which all TTS engines are listed -->
<string name="tts_engines_section">Engines</string>
@@ -4772,6 +4772,10 @@
<string name="user_add_user_menu">Add user or profile</string>
<!-- User settings summary for a restricted profile [CHAR LIMIT=50] -->
<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] -->
<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] -->
@@ -4780,6 +4784,8 @@
<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] -->
<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] -->
<string name="user_owner">Owner</string>
<!-- 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);
}
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) {