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

Merge changes from topic "am-70560489aa0542c99c9043781a2333f5" into rvc-d1-dev-plus-aosp

Browse Source 
* changes:
  Merge "[DO NOT MERGE] Clear properties after interaction is ended" into rvc-dev am: cdaa4f3cb0 am: d6744b0a9b
  [DO NOT MERGE] Clear properties after interaction is ended am: 1145db5d8e am: 63a3ab4e33
This commit is contained in:
Automerger Merge Worker
2020-07-08 07:42:28 +00:00
committed by Android (Google) Code Review
parent 0d878a3e1f c71cc8a299
commit 38f60684ba
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/accessibility/java/com/android/server/accessibility/gestures/EventDispatcher.java
View File

@@ -322,6 +322,12 @@ class EventDispatcher {
return true; return true;
} }
void clear() {
mLongPressingPointerId = -1;
mLongPressingPointerDeltaX = 0;
mLongPressingPointerDeltaY = 0;
}
public void clickWithTouchEvents(MotionEvent event, MotionEvent rawEvent, int policyFlags) { public void clickWithTouchEvents(MotionEvent event, MotionEvent rawEvent, int policyFlags) {
final int pointerIndex = event.getActionIndex(); final int pointerIndex = event.getActionIndex();
final int pointerId = event.getPointerId(pointerIndex); final int pointerId = event.getPointerId(pointerIndex);

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

@@ -809,6 +809,7 @@ public class TouchExplorer extends BaseEventStreamTransformation
// Announce the end of a the touch interaction. // Announce the end of a the touch interaction.
mAms.onTouchInteractionEnd(); mAms.onTouchInteractionEnd();
mDispatcher.clear();
mDispatcher.sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_INTERACTION_END); mDispatcher.sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_INTERACTION_END);
} break; } break;