diff --git a/res/values/strings.xml b/res/values/strings.xml index 9e113c3bc62..d8625a9af35 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5580,10 +5580,12 @@ Add account Work profile isn\u2019t available yet - - Work mode - - Allow work profile to function, including apps, background sync, and related features + + Work profile + + Managed by your organization + + Apps and notifications are off Remove work profile diff --git a/res/xml/managed_profile_settings.xml b/res/xml/managed_profile_settings.xml index 58fcd8802a6..c283e13ca52 100644 --- a/res/xml/managed_profile_settings.xml +++ b/res/xml/managed_profile_settings.xml @@ -20,14 +20,13 @@ + android:title="@string/work_mode_label" + android:summary="@string/summary_placeholder"/> + settings:useAdditionalSummary="true"/> \ No newline at end of file diff --git a/src/com/android/settings/accounts/ManagedProfileSettings.java b/src/com/android/settings/accounts/ManagedProfileSettings.java index 3ea7cf730d5..09330428d39 100644 --- a/src/com/android/settings/accounts/ManagedProfileSettings.java +++ b/src/com/android/settings/accounts/ManagedProfileSettings.java @@ -104,8 +104,7 @@ public class ManagedProfileSettings extends SettingsPreferenceFragment private void loadDataAndPopulateUi() { if (mWorkModePreference != null) { - mWorkModePreference.setChecked( - !mUserManager.isQuietModeEnabled(mManagedUser)); + updateWorkModePreference(); } if (mContactPrefrence != null) { @@ -124,6 +123,14 @@ public class ManagedProfileSettings extends SettingsPreferenceFragment return MetricsProto.MetricsEvent.ACCOUNTS_WORK_PROFILE_SETTINGS; } + private void updateWorkModePreference() { + boolean isWorkModeOn = !mUserManager.isQuietModeEnabled(mManagedUser); + mWorkModePreference.setChecked(isWorkModeOn); + mWorkModePreference.setSummary(isWorkModeOn + ? R.string.work_mode_on_summary + : R.string.work_mode_off_summary); + } + @Override public boolean onPreferenceChange(Preference preference, Object newValue) { @@ -159,8 +166,7 @@ public class ManagedProfileSettings extends SettingsPreferenceFragment || action.equals(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE)) { if (intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL) == mManagedUser.getIdentifier()) { - mWorkModePreference.setChecked( - !mUserManager.isQuietModeEnabled(mManagedUser)); + updateWorkModePreference(); } return; }