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

Enter touch mode on ACTION_SCROLL.

Browse Source 
Also fix the lastTouch tracking so it ignores irrelevant non-touch
events (like ACTION_HOVER).

Change-Id: I9e04872cb1f762aa6dcded1f9f83bf20eda17415
This commit is contained in:
Jeff Brown
2011-07-14 19:14:22 -07:00
parent 7770b90129
commit 7564d62a77
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/view/ViewAncestor.java
View File

@@ -2634,8 +2634,9 @@ public final class ViewAncestor extends Handler implements ViewParent,
mInputEventDeliverTimeNanos = System.nanoTime();
}
final boolean isTouchEvent = event.isTouchEvent();
if (mInputEventConsistencyVerifier != null) {
if (event.isTouchEvent()) {
if (isTouchEvent) {
mInputEventConsistencyVerifier.onTouchEvent(event, 0);
} else {
mInputEventConsistencyVerifier.onGenericMotionEvent(event, 0);
@@ -2653,9 +2654,9 @@ public final class ViewAncestor extends Handler implements ViewParent,
mTranslator.translateEventInScreenToAppWindow(event);
}
// Enter touch mode on the down.
boolean isDown = event.getAction() == MotionEvent.ACTION_DOWN;
if (isDown) {
// Enter touch mode on down or scroll.
final int action = event.getAction();
if (action == MotionEvent.ACTION_DOWN || action == MotionEvent.ACTION_SCROLL) {
ensureTouchMode(true);
}
@@ -2668,8 +2669,10 @@ public final class ViewAncestor extends Handler implements ViewParent,
}
// Remember the touch position for possible drag-initiation.
mLastTouchPoint.x = event.getRawX();
mLastTouchPoint.y = event.getRawY();
if (isTouchEvent) {
mLastTouchPoint.x = event.getRawX();
mLastTouchPoint.y = event.getRawY();
}
// Dispatch touch to view hierarchy.
boolean handled = mView.dispatchPointerEvent(event);