From d075b63c5287281796b778f8239c41d03f14691a Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Fri, 17 Apr 2020 13:18:14 -0400
Subject: [PATCH] A11y services can perform click on keyguard notifs

When notifications are showing on the keyguard, notifications must be
double-tapped to open. These touches are intercepted in the
ActivatableNotificationViewController's touch handler, so we do not need
to double-check for mNeedsDimming on performClick in the view. The
removal of this check allows a11y services to perform clicks on the
view.

Test: manual
Fixes: 130588833
Change-Id: Ie4b9a928599a056dba982ef12f974b8a2bf14f59
---
 .../row/ActivatableNotificationView.java            | 13 -------------
 .../row/ActivatableNotificationViewController.java  |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
index b9dd97482d883..92b597b015591 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
@@ -331,19 +331,6 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
                 .setDuration(ACTIVATE_ANIMATION_LENGTH);
     }
 
-    @Override
-    public boolean performClick() {
-        if (!mNeedsDimming || (mAccessibilityManager != null
-                && mAccessibilityManager.isTouchExplorationEnabled())) {
-            return super.performClick();
-        }
-        return false;
-    }
-
-    boolean superPerformClick() {
-        return super.performClick();
-    }
-
     /**
      * Cancels the hotspot and makes the notification inactive.
      */
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationViewController.java
index 2f0e433b39278..dd30c890e75b2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationViewController.java
@@ -72,7 +72,7 @@ public class ActivatableNotificationViewController {
             } else {
                 mView.makeInactive(true /* animate */);
             }
-        }, mView::superPerformClick, mView::handleSlideBack,
+        }, mView::performClick, mView::handleSlideBack,
                 mFalsingManager::onNotificationDoubleTap);
         mView.setOnTouchListener(mTouchHandler);
         mView.setTouchHandler(mTouchHandler);