From 21bb9b8c4a6855c8cf60719423829e262b6d704c Mon Sep 17 00:00:00 2001
From: Suprabh Shukla <suprabh@google.com>
Date: Wed, 24 May 2017 00:03:37 +0000
Subject: [PATCH] Revert "Adding SecureTouchListener to DeviceAdminAdd"

This reverts commit c1f10cb9c6f4188b2b6b95fa35b8c2a584ff55cb.

Bug: 35056974,
     38306660
Change-Id: I42b8e60f05f57aad1d8851268a6b40dd295d219b
---
 res/values/strings.xml                       | 5 -----
 src/com/android/settings/DeviceAdminAdd.java | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3b5a8730863..e7d17cb0a78 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4302,11 +4302,6 @@
          can't verify user consent. [CHAR LIMIT=NONE] -->
     <string name="touch_filtered_warning">Because an app is obscuring a permission request, Settings
         can’t verify your response.</string>
-    <!-- Warning shown when user input has been blocked due to another app overlaying screen
-         content. Since we don't know what the app is showing on top of the input target, we
-         can't verify user consent. [CHAR LIMIT=NONE] -->
-    <string name="window_obscured_warning">Because another app is displaying on top of these options,
-        Settings can\u2019t respond to your action.</string>
     <!-- Warning that the device data will not be encrypted with password or PIN if
         enabling an accessibility service and there is a secure lock setup. [CHAR LIMIT=NONE] -->
     <string name="enable_service_encryption_warning">If you turn on <xliff:g id="service"
diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java
index 3bb82cf2608..fb2f29f5054 100644
--- a/src/com/android/settings/DeviceAdminAdd.java
+++ b/src/com/android/settings/DeviceAdminAdd.java
@@ -65,8 +65,6 @@ import com.android.settings.R;
 import com.android.settings.users.UserDialogs;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-import com.android.settingslib.SecureTouchListener;
-
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
@@ -352,8 +350,6 @@ public class DeviceAdminAdd extends Activity {
 
         final View restrictedAction = findViewById(R.id.restricted_action);
         restrictedAction.setFilterTouchesWhenObscured(true);
-        restrictedAction.setOnTouchListener(
-                new SecureTouchListener(getString(R.string.window_obscured_warning)));
         restrictedAction.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 if (mAdding) {