From 20de6bde28a56b2307e9dc2c85b6a90500fcb00a Mon Sep 17 00:00:00 2001 From: Dave Mankoff Date: Tue, 18 Feb 2020 14:06:46 -0500 Subject: [PATCH] Fix double tapping notifications on lock screen. http://ag/10273995 broke double tapping on notifications. This cl restores the behavior by replacing a call to ActivatableNotificationView#performClick with ExpandableOutlineView#performClick. That is to say, we needed to call the super method, as we did before the breaking cl was checked in. Bug: 149744457 Test: atest SystemUITests Change-Id: Ie77ade20f74b04eb0edbe0f1806938523068175a --- .../notification/row/ActivatableNotificationView.java | 4 ++++ .../row/ActivatableNotificationViewController.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 3eac229af3f69..b03ba3c2a1105 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 @@ -336,6 +336,10 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView 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 8465658079f16..2643ec9750238 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,8 @@ public class ActivatableNotificationViewController { } else { mView.makeInactive(true /* animate */); } - }, mView::performClick, mView::handleSlideBack, mFalsingManager::onNotificationDoubleTap); + }, mView::superPerformClick, mView::handleSlideBack, + mFalsingManager::onNotificationDoubleTap); mView.setOnTouchListener(mTouchHandler); mView.setTouchHandler(mTouchHandler); mView.setOnDimmedListener(dimmed -> {