From cbc3a6a1deb9993d874fe2ef894f6d3081959322 Mon Sep 17 00:00:00 2001 From: Tony Mak Date: Tue, 3 Apr 2018 18:51:39 +0100 Subject: [PATCH] We should show custom title for suspend app dialog BUG: 77523074 Test: Suspend an app, observe the new title. Test: m -j RunSettingsRoboTest Change-Id: Ide0329422e68b5ed6418365f2d0b0e0d11f0dec7 --- res/values/strings.xml | 2 ++ .../enterprise/ActionDisabledByAdminDialogHelper.java | 3 +++ .../enterprise/ActionDisabledByAdminDialogHelperTest.java | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/res/values/strings.xml b/res/values/strings.xml index d0556d30be3..a6fffa55eeb 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -8775,6 +8775,8 @@ Screenshot not allowed Can\'t turn off backups + + Can\'t open this app If you have questions, contact your IT admin diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java index 3429957b016..ff43e6e6a22 100644 --- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java +++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java @@ -148,6 +148,9 @@ public class ActionDisabledByAdminDialogHelper { case DevicePolicyManager.POLICY_MANDATORY_BACKUPS: titleView.setText(R.string.disabled_by_policy_title_turn_off_backups); break; + case DevicePolicyManager.POLICY_SUSPEND_PACKAGES: + titleView.setText(R.string.disabled_by_policy_title_suspend_packages); + break; default: // Use general text if no specialized title applies titleView.setText(R.string.disabled_by_policy_title); diff --git a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java index 981ce135d7c..6703a0b22c5 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java @@ -128,6 +128,10 @@ public class ActionDisabledByAdminDialogHelperTest { assertEquals(Shadows.shadowOf(textView).innerText(), mActivity.getString(R.string.disabled_by_policy_title_turn_off_backups)); + mHelper.setAdminSupportTitle(view, DevicePolicyManager.POLICY_SUSPEND_PACKAGES); + assertEquals(Shadows.shadowOf(textView).innerText(), + mActivity.getString(R.string.disabled_by_policy_title_suspend_packages)); + mHelper.setAdminSupportTitle(view, "another restriction"); assertEquals(Shadows.shadowOf(textView).innerText(), mActivity.getString(R.string.disabled_by_policy_title));