From 9308154090fb552a887b1db33cd305c7a31dc27b Mon Sep 17 00:00:00 2001 From: arangelov Date: Fri, 27 Oct 2017 13:51:28 +0100 Subject: Make "Action not allowed" dialog compliant with Material Spec and replace full screen activities with the dialog. Bug: 64893948 Test: make ROBOTEST_FILTER=ActionDisabledByAdminDialogTest -j40 RunSettingsRoboTests Test: make ROBOTEST_FILTER=ActionDisabledByAdminDialogHelperTest -j40 RunSettingsRoboTests Change-Id: I9308d8d86a3789b8f2c92b9f4f20cf00cce71d14 --- src/com/android/settings/MasterClearConfirm.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/com/android/settings/MasterClearConfirm.java') diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java index 59736fd4cf..a92c8f85c7 100644 --- a/src/com/android/settings/MasterClearConfirm.java +++ b/src/com/android/settings/MasterClearConfirm.java @@ -34,6 +34,7 @@ import android.widget.TextView; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.InstrumentedFragment; +import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settingslib.RestrictedLockUtils; import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; @@ -151,10 +152,11 @@ public class MasterClearConfirm extends InstrumentedFragment { UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) { return inflater.inflate(R.layout.master_clear_disallowed_screen, null); } else if (admin != null) { - View view = inflater.inflate(R.layout.admin_support_details_empty_view, null); - ShowAdminSupportDetailsDialog.setAdminSupportDetails(getActivity(), view, admin, false); - view.setVisibility(View.VISIBLE); - return view; + new ActionDisabledByAdminDialogHelper(getActivity()) + .prepareDialogBuilder(UserManager.DISALLOW_FACTORY_RESET, admin) + .setOnDismissListener(__ -> getActivity().finish()) + .show(); + return new View(getActivity()); } mContentView = inflater.inflate(R.layout.master_clear_confirm, null); establishFinalConfirmationState(); @@ -167,9 +169,9 @@ public class MasterClearConfirm extends InstrumentedFragment { TextView confirmationMessage = (TextView) mContentView.findViewById(R.id.master_clear_confirm); if (confirmationMessage != null) { - String accessibileText = new StringBuilder(currentTitle).append(",").append( + String accessibleText = new StringBuilder(currentTitle).append(",").append( confirmationMessage.getText()).toString(); - getActivity().setTitle(Utils.createAccessibleSequence(currentTitle, accessibileText)); + getActivity().setTitle(Utils.createAccessibleSequence(currentTitle, accessibleText)); } } -- cgit v1.2.3