From 9a14484b3879b6fd2f5b7ff07312aabd3e112a0a Mon Sep 17 00:00:00 2001
From: Phil Weaver <pweaver@google.com>
Date: Tue, 11 Jul 2017 11:34:40 -0700
Subject: [PATCH] DO NOT MERGE Back-port ag/2491664

Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Icbd00799e4b12cde9d17d3d0abbd38d9643b26c4
---
 AndroidManifest.xml                                  |  1 +
 ...ToggleAccessibilityServicePreferenceFragment.java | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f746f2b3df2..7a113113d29 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -67,6 +67,7 @@
     <uses-permission android:name="android.permission.ACCESS_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.REBOOT" />
     <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
+    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />
 
     <application android:label="@string/settings_label"
             android:icon="@mipmap/ic_launcher_settings"
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 0c568f06301..38a5ecd7b89 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -31,6 +31,8 @@ import android.provider.Settings;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -44,6 +46,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+
 public class ToggleAccessibilityServicePreferenceFragment
         extends ToggleFeaturePreferenceFragment implements DialogInterface.OnClickListener {
 
@@ -159,7 +163,7 @@ public class ToggleAccessibilityServicePreferenceFragment
             if (info == null) {
                 return null;
             }
-            return new AlertDialog.Builder(getActivity())
+            AlertDialog ad = new AlertDialog.Builder(getActivity())
             .setTitle(getString(R.string.enable_service_title,
                     info.getResolveInfo().loadLabel(getPackageManager())))
                     .setIconAttribute(android.R.attr.alertDialogIcon)
@@ -168,6 +172,12 @@ public class ToggleAccessibilityServicePreferenceFragment
                     .setPositiveButton(android.R.string.ok, this)
                     .setNegativeButton(android.R.string.cancel, this)
                     .create();
+
+            Window window = ad.getWindow();
+            WindowManager.LayoutParams params = window.getAttributes();
+            params.privateFlags |= PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+            window.setAttributes(params);
+            return ad;
         }
             case DIALOG_ID_DISABLE_WARNING: {
             mShownDialogId = DIALOG_ID_DISABLE_WARNING;