commit ad6a9c992b0088be635fbf369489f890caeff3e1
author Ben Pietrzak <bpietrzak@google.com> Mon Nov 05 13:10:14 2012 -0800
committer Ben Pietrzak <bpietrzak@google.com> Mon Nov 05 13:10:14 2012 -0800
tree c95d897beaa50b95f0c23f3b48d50db8996d8dd5
parent 298802230687114a545c2c059139f544d194cb2f

Support new touchpad event protocol.

Change-Id: Ib690f7a1abd367870c8b633d77d2c18d6ada9b05

core/java/android/view/SimulatedTrackball.java

diff --git a/core/java/android/view/SimulatedTrackball.java b/core/java/android/view/SimulatedTrackball.java
index 5314019..123cfcd 100644
--- a/core/java/android/view/SimulatedTrackball.java
+++ b/core/java/android/view/SimulatedTrackball.java
@@ -127,7 +127,7 @@
         // 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 @@
                 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 @@
                     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;