Merge "A11y services can perform click on keyguard notifs" into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-04-23 15:29:18 +00:00
committed by Android (Google) Code Review
2 changed files with 1 additions and 14 deletions

View File

@@ -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.
*/

View File

@@ -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);