diff options
| author | Justin Koh <justinkoh@google.com> | 2012-11-06 13:22:11 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-06 13:22:26 -0800 |
| commit | 41048d670d42075732723e72d7f303498690ea99 (patch) | |
| tree | a8ff26f9376a1bba4a5b9e536e3fb6eeb313cb37 /core/java/android | |
| parent | 58e0fb9adbe579a068849a7865a7f1bce7531d1c (diff) | |
| parent | ad6a9c992b0088be635fbf369489f890caeff3e1 (diff) | |
Merge "Support new touchpad event protocol." into jb-mr1-aah-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/SimulatedTrackball.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/view/SimulatedTrackball.java b/core/java/android/view/SimulatedTrackball.java index 5314019150ca..123cfcdcf2d6 100644 --- a/core/java/android/view/SimulatedTrackball.java +++ b/core/java/android/view/SimulatedTrackball.java @@ -127,7 +127,7 @@ class SimulatedTrackball { // Store what time the touchpad event occurred final long time = SystemClock.uptimeMillis(); switch (event.getAction()) { - case MotionEvent.ACTION_HOVER_ENTER: + case MotionEvent.ACTION_DOWN: mLastTouchPadStartTimeMs = time; mAlwaysInTapRegion = true; mTouchpadEnterXPosition = event.getX(); @@ -145,7 +145,7 @@ class SimulatedTrackball { mHandler.removeMessages(FLICK_MSG_ID); break; - case MotionEvent.ACTION_HOVER_MOVE: + case MotionEvent.ACTION_MOVE: // Determine whether the move is slop or an intentional move float deltaX = event.getX() - mTouchpadEnterXPosition; float deltaY = event.getY() - mTouchpadEnterYPosition; @@ -214,19 +214,19 @@ class SimulatedTrackball { mLastTouchPadKeySendTimeMs = time; } break; - case MotionEvent.ACTION_HOVER_EXIT: + case MotionEvent.ACTION_UP: if (time - mLastTouchPadStartTimeMs < MAX_TAP_TIME && mAlwaysInTapRegion) { // Trackball Down MotionEvent trackballEvent = MotionEvent.obtain(mLastTouchPadStartTimeMs, time, MotionEvent.ACTION_DOWN, 0, 0, 0, 0, event.getMetaState(), 10f, 10f, event.getDeviceId(), 0); - trackballEvent.setSource(InputDevice.SOURCE_CLASS_TRACKBALL); + trackballEvent.setSource(InputDevice.SOURCE_TRACKBALL); viewroot.enqueueInputEvent(trackballEvent); // Trackball Release trackballEvent = MotionEvent.obtain(mLastTouchPadStartTimeMs, time, MotionEvent.ACTION_UP, 0, 0, 0, 0, event.getMetaState(), 10f, 10f, event.getDeviceId(), 0); - trackballEvent.setSource(InputDevice.SOURCE_CLASS_TRACKBALL); + trackballEvent.setSource(InputDevice.SOURCE_TRACKBALL); viewroot.enqueueInputEvent(trackballEvent); } else { float xMoveSquared = mLastMoveX * mLastMoveX; |