Merge "We should show custom title for suspend app dialog" into pi-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 26210d9..7507de2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8774,6 +8774,8 @@
<string name="disabled_by_policy_title_screen_capture">Screenshot not allowed</string>
<!-- Title for dialog displayed to tell user that turning off backups is disallowed by an admin [CHAR LIMIT=50] -->
<string name="disabled_by_policy_title_turn_off_backups">Can\'t turn off backups</string>
+ <!-- Title for dialog displayed to tell user that the app was suspended by an admin [CHAR LIMIT=50] -->
+ <string name="disabled_by_policy_title_suspend_packages">Can\'t open this app</string>
<!-- Shown when the user tries to change a settings locked by an admin [CHAR LIMIT=200] -->
<string name="default_admin_support_msg">If you have questions, contact your IT admin</string>
<!-- Shown in dialog to allow user to see more information about the device admin [CHAR LIMIT=30] -->
diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
index 3429957..ff43e6e 100644
--- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
+++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
@@ -148,6 +148,9 @@
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 32926b4..ccd66e8 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 @@
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));