Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix hardly to perform 3-finger swipe from the bottom"

Browse Source
This commit is contained in:
Ryan Lin
2020-08-25 05:49:17 +00:00
committed by Android (Google) Code Review
parent ef3a1d0f2b a67afd3c01
commit f2d5bf57a8
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java
View File

@@ -644,18 +644,9 @@ public class TouchExplorer extends BaseEventStreamTransformation
if (mGestureDetector.isMultiFingerGesturesEnabled()) {
if (mGestureDetector.isTwoFingerPassthroughEnabled()) {
if (event.getPointerCount() == 3) {
boolean isOnBottomEdge = true;
// If three fingers went down on the bottom edge of the screen, delegate
// immediately.
final long screenHeight =
mContext.getResources().getDisplayMetrics().heightPixels;
for (int i = 0; i < TouchState.MAX_POINTER_COUNT; ++i) {
if (mReceivedPointerTracker.getReceivedPointerDownY(i)
< (screenHeight - mEdgeSwipeHeightPixels)) {
isOnBottomEdge = false;
}
}
if (isOnBottomEdge) {
if (allPointersDownOnBottomEdge(event)) {
if (DEBUG) {
Slog.d(LOG_TAG, "Three-finger edge swipe detected.");
}
@@ -1063,6 +1054,22 @@ public class TouchExplorer extends BaseEventStreamTransformation
return downEvent;
}
private boolean allPointersDownOnBottomEdge(MotionEvent event) {
final long screenHeight =
mContext.getResources().getDisplayMetrics().heightPixels;
for (int i = 0; i < event.getPointerCount(); ++i) {
final int pointerId = event.getPointerId(i);
final float pointerDownY = mReceivedPointerTracker.getReceivedPointerDownY(pointerId);
if (pointerDownY < (screenHeight - mEdgeSwipeHeightPixels)) {
if (DEBUG) {
Slog.d(LOG_TAG, "The pointer is not on the bottom edge" + pointerDownY);
}
return false;
}
}
return true;
}
public TouchState getState() {
return mState;
}