fix(KeyboardView): multpoint touch wrongly recognized as swipe

osfans · Oct 25, 2021 · a99fb0a · a99fb0a
1 parent 04c9591
commit a99fb0a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardView.java b/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardView.java
@@ -165,6 +165,7 @@ public interface OnKeyboardActionListener {
   private int mStartX;
   private int mStartY;
   private int touchX0, touchY0;
+  private boolean touchOnePoint;
 
   private boolean mProximityCorrectOn;
 
@@ -1356,6 +1357,7 @@ else if (action == MotionEvent.ACTION_UP)
       case MotionEvent.ACTION_DOWN:
         touchX0 = touchX;
         touchY0 = touchY;
+        touchOnePoint = true;
       case MotionEvent.ACTION_POINTER_DOWN:
         mAbortKey = false;
         mStartX = touchX;
@@ -1369,6 +1371,7 @@ else if (action == MotionEvent.ACTION_UP)
         mDownKey = keyIndex;
         mDownTime = me.getEventTime();
         mLastMoveTime = mDownTime;
+        touchOnePoint = false;
         if (action == MotionEvent.ACTION_POINTER_DOWN) break; // 並擊鬆開前的虛擬按鍵事件
         checkMultiTap(eventTime, keyIndex);
         mKeyboardActionListener.onPress(keyIndex != NOT_A_KEY ? mKeys[keyIndex].getCode() : 0);
@@ -1444,7 +1447,7 @@ else if (action == MotionEvent.ACTION_UP)
         int absY = Math.abs(dy);
         int travel = getPrefs().getKeyboard().getSwipeTravel();
 
-        if (Math.max(absY, absX) > travel) {
+        if (Math.max(absY, absX) > travel && touchOnePoint) {
           int type;
           if (absX < absY) {
             Timber.d("swipeDebug.ext y, dX=%d, dY=%d", dx, dy);