Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8c53f7d authored by Tony Mak's avatar Tony Mak Committed by Android (Google) Code Review
Browse files

Merge "We should show custom title for suspend app dialog" into pi-dev

parents 54ee35c3 cbc3a6a1

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -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] -->

src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java

+3 −0
Original line number Diff line number Diff line
@@ -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);

tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java

+4 −0
Original line number Diff line number Diff line
@@ -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));