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

[DO NOT MERGE] Fix hardly to perform 3-finger swipe from the bottom

Browse Source 
We accidentky checked invalid pointers down position.
In stead of checking all pointers, we check the pointer ids
from the motion event.

Bug: 165576902
Test: manually test
atest TouchExplorerTest

Change-Id: Id530bf4b760351215726b2afd781433b590f57ce
This commit is contained in:
ryanlwlin
2020-08-20 09:53:58 +08:00
committed by Ameer Armaly
parent 217bb3b1d2
commit dd8ef30adf
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

@@ -622,18 +622,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.");
}
@@ -1050,6 +1041,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;
}