Fix more click related bugs

Add exception for launcher home screen
aquirozc · Mar 13, 2021 · 968919f · 968919f
1 parent 10d3a24
commit 968919f
Showing 1 changed file with 23 additions and 10 deletions.
diff --git a/app/src/main/java/io/github/virresh/matvt/engine/impl/MouseEmulationEngine.java b/app/src/main/java/io/github/virresh/matvt/engine/impl/MouseEmulationEngine.java
@@ -139,7 +139,7 @@ public void run() {
     /**
      * Send input via Android's gestureAPI
      * Only sends swipes
-     * see {@link MouseEmulationEngine#createClick(PointF)} for clicking at a point
+     * see {@link MouseEmulationEngine#createClick(PointF, long)} for clicking at a point
      * @param originPoint
      * @param direction
      */
@@ -171,8 +171,9 @@ private void detachPreviousTimer () {
         }
     }
 
-    private static GestureDescription createClick (PointF clickPoint) {
-        final int DURATION = 1;
+    private static GestureDescription createClick (PointF clickPoint, long duration) {
+        final int DURATION = 1 + (int) duration;
+        Log.i(LOG_TAG, "Actual Duration used -- " + DURATION);
         Path clickPath = new Path();
         clickPath.moveTo(clickPoint.x, clickPoint.y);
         GestureDescription.StrokeDescription clickStroke =
@@ -267,7 +268,11 @@ else if (keyEvent.getKeyCode() == KeyEvent.KEYCODE_DPAD_CENTER) {
                 int action = AccessibilityNodeInfo.ACTION_CLICK;
                 Point pInt = new Point((int) mPointerControl.getPointerLocation().x, (int) mPointerControl.getPointerLocation().y);
                 List<AccessibilityWindowInfo> windowList= mService.getWindows();
+                boolean wasIME = false;
                 for (AccessibilityWindowInfo window : windowList) {
+                    if (consumed || wasIME) {
+                        break;
+                    }
                     List<AccessibilityNodeInfo> nodeHierarchy = findNode(window.getRoot(), action, pInt);
                     for (int i=nodeHierarchy.size()-1; i>=0; i--){
                         if (consumed) return consumed;
@@ -276,17 +281,25 @@ else if (keyEvent.getKeyCode() == KeyEvent.KEYCODE_DPAD_CENTER) {
                         if (availableActions.contains(AccessibilityNodeInfo.AccessibilityAction.ACTION_FOCUS)){
                             hitNode.performAction(AccessibilityNodeInfo.FOCUS_INPUT);
                         }
-                        if (availableActions.contains(AccessibilityNodeInfo.AccessibilityAction.ACTION_SELECT)){
-                            hitNode.performAction(AccessibilityNodeInfo.ACTION_SELECT);
+//                        if (hitNode.isFocused() && availableActions.contains(AccessibilityNodeInfo.AccessibilityAction.ACTION_SELECT)){
+//                            hitNode.performAction(AccessibilityNodeInfo.ACTION_SELECT);
+//                        }
+//                        if (hitNode.isFocused() && availableActions.contains(AccessibilityNodeInfo.AccessibilityAction.ACTION_CLICK)){
+//                            consumed = hitNode.performAction(AccessibilityNodeInfo.ACTION_CLICK);
+//                        }
+                        if (window.getType() == AccessibilityWindowInfo.TYPE_INPUT_METHOD) {
+                            wasIME = true;
+                            consumed = hitNode.performAction(AccessibilityNodeInfo.ACTION_CLICK);
+                            break;
                         }
-                        if (availableActions.contains(AccessibilityNodeInfo.AccessibilityAction.ACTION_CLICK)){
+
+                        if (hitNode.getPackageName().equals("com.google.android.tvlauncher") && availableActions.contains(AccessibilityNodeInfo.AccessibilityAction.ACTION_CLICK)) {
                             consumed = hitNode.performAction(AccessibilityNodeInfo.ACTION_CLICK);
                         }
                     }
-                    if (!consumed){
-                        mService.dispatchGesture(createClick(mPointerControl.getPointerLocation()), null, null);
-                        return true;
-                    }
+                }
+                if (!consumed || !wasIME) {
+                    mService.dispatchGesture(createClick(mPointerControl.getPointerLocation(), keyEvent.getEventTime() - keyEvent.getDownTime()), null, null);
                 }
             }
         }