Merge "A11y services can perform click on keyguard notifs" into rvc-dev am:... (d084ebed) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -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.
		*/

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);