Merge "cleanup(expressive): Use AndroidX dialog for the a11yservice warning" into main (93a35f9c) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java

+40 −21

Original line number	Diff line number	Diff line
		@@ -16,8 +16,11 @@

		package com.android.settings.accessibility;

		import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;

		import static com.android.settings.accessibility.AccessibilityDialogUtils.DialogEnums;
		import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logAccessibilityServiceEnabled;
		import static com.android.internal.accessibility.dialog.AccessibilityServiceWarning.createAccessibilityServiceWarningDialogContentView;

		import android.accessibilityservice.AccessibilityServiceInfo;
		import android.annotation.SuppressLint;
		@@ -38,9 +41,13 @@ import android.os.SystemClock;
		import android.text.BidiFormatter;
		import android.text.TextUtils;
		import android.util.Log;
		import android.view.View;
		import android.view.Window;
		import android.view.WindowManager;
		import android.view.accessibility.AccessibilityManager;
		import android.widget.CompoundButton;

		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;
		import androidx.appcompat.app.AlertDialog;

		@@ -146,6 +153,24 @@ public class ToggleAccessibilityServicePreferenceFragment extends
		return null;
		}

		private AlertDialog createAccessibilityServiceWarningDialog(
		@NonNull AccessibilityServiceInfo info,
		@NonNull View.OnClickListener allowListener,
		@NonNull View.OnClickListener denyListener,
		@NonNull View.OnClickListener uninstallListener) {
		final Context context = getPrefContext();
		final AlertDialog ad = new AlertDialog.Builder(context)
		.setView(createAccessibilityServiceWarningDialogContentView(
		context, info, allowListener, denyListener, uninstallListener))
		.setCancelable(true)
		.create();
		Window window = ad.getWindow();
		WindowManager.LayoutParams params = window.getAttributes();
		params.privateFlags \|= SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
		window.setAttributes(params);
		return ad;
		}

		@Override
		public Dialog onCreateDialog(int dialogId) {
		final AccessibilityServiceInfo info = getAccessibilityServiceInfo();
		@@ -154,9 +179,7 @@ public class ToggleAccessibilityServicePreferenceFragment extends
		if (info == null) {
		return null;
		}
		mWarningDialog =
		com.android.internal.accessibility.dialog.AccessibilityServiceWarning
		.createAccessibilityServiceWarningDialog(getPrefContext(), info,
		mWarningDialog = createAccessibilityServiceWarningDialog(info,
		v -> onAllowButtonFromEnableToggleClicked(),
		v -> onDenyButtonFromEnableToggleClicked(),
		v -> onDialogButtonFromUninstallClicked());
		@@ -165,9 +188,7 @@ public class ToggleAccessibilityServicePreferenceFragment extends
		if (info == null) {
		return null;
		}
		mWarningDialog =
		com.android.internal.accessibility.dialog.AccessibilityServiceWarning
		.createAccessibilityServiceWarningDialog(getPrefContext(), info,
		mWarningDialog = createAccessibilityServiceWarningDialog(info,
		v -> onAllowButtonFromShortcutToggleClicked(),
		v -> onDenyButtonFromShortcutToggleClicked(),
		v -> onDialogButtonFromUninstallClicked());
		@@ -176,9 +197,7 @@ public class ToggleAccessibilityServicePreferenceFragment extends
		if (info == null) {
		return null;
		}
		mWarningDialog =
		com.android.internal.accessibility.dialog.AccessibilityServiceWarning
		.createAccessibilityServiceWarningDialog(getPrefContext(), info,
		mWarningDialog = createAccessibilityServiceWarningDialog(info,
		v -> onAllowButtonFromShortcutClicked(),
		v -> onDenyButtonFromShortcutClicked(),
		v -> onDialogButtonFromUninstallClicked());

tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import static com.android.settings.testutils.AccessibilityTestUtils.assertShortc
		import static com.google.common.truth.Truth.assertThat;

		import android.accessibilityservice.AccessibilityServiceInfo;
		import android.app.AlertDialog;
		import android.app.Dialog;
		import android.content.ComponentName;
		import android.content.Context;
		@@ -37,6 +36,7 @@ import android.widget.TextView;

		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;
		import androidx.appcompat.app.AlertDialog;
		import androidx.fragment.app.Fragment;
		import androidx.fragment.app.FragmentFactory;
		import androidx.fragment.app.testing.FragmentScenario;