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

am d854304c: Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2

Browse Source 
* commit 'd854304c2bcadbda37a7f1b24723dbc0030073ca':
  Button state should reflect actual buttons. (DO NOT MERGE)
This commit is contained in:
Jeff Brown
2011-05-31 15:44:01 -07:00
committed by Android Git Automerger
parent eb01203447 d854304c2b
commit 1311455f3e
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/input/InputReader.cpp
View File

@@ -3455,8 +3455,6 @@ bool TouchInputMapper::preparePointerGestures(nsecs_t when,
mPointerGesture.currentGestureMode = PointerGesture::NEUTRAL; mPointerGesture.currentGestureMode = PointerGesture::NEUTRAL;
mPointerGesture.currentGestureIdBits.clear(); mPointerGesture.currentGestureIdBits.clear();
mPointerController->setButtonState(0);
if (mParameters.gestureMode == Parameters::GESTURE_MODE_SPOTS) { if (mParameters.gestureMode == Parameters::GESTURE_MODE_SPOTS) {
mPointerGesture.spotGesture = PointerControllerInterface::SPOT_GESTURE_NEUTRAL; mPointerGesture.spotGesture = PointerControllerInterface::SPOT_GESTURE_NEUTRAL;
mPointerGesture.spotIdBits.clear(); mPointerGesture.spotIdBits.clear();
@@ -3551,8 +3549,6 @@ bool TouchInputMapper::preparePointerGestures(nsecs_t when,
mPointerGesture.currentGestureMode = PointerGesture::QUIET; mPointerGesture.currentGestureMode = PointerGesture::QUIET;
mPointerGesture.currentGestureIdBits.clear(); mPointerGesture.currentGestureIdBits.clear();
mPointerController->setButtonState(0);
if (mParameters.gestureMode == Parameters::GESTURE_MODE_SPOTS) { if (mParameters.gestureMode == Parameters::GESTURE_MODE_SPOTS) {
mPointerGesture.spotGesture = PointerControllerInterface::SPOT_GESTURE_NEUTRAL; mPointerGesture.spotGesture = PointerControllerInterface::SPOT_GESTURE_NEUTRAL;
mPointerGesture.spotIdBits.clear(); mPointerGesture.spotIdBits.clear();
@@ -3638,8 +3634,6 @@ bool TouchInputMapper::preparePointerGestures(nsecs_t when,
mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_Y, y); mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_Y, y);
mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_PRESSURE, 1.0f); mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_PRESSURE, 1.0f);
mPointerController->setButtonState(BUTTON_STATE_PRIMARY);
if (mParameters.gestureMode == Parameters::GESTURE_MODE_SPOTS) { if (mParameters.gestureMode == Parameters::GESTURE_MODE_SPOTS) {
if (activeTouchId >= 0) { if (activeTouchId >= 0) {
// Collapse all spots into one point at the pointer location. // Collapse all spots into one point at the pointer location.
@@ -3698,8 +3692,6 @@ bool TouchInputMapper::preparePointerGestures(nsecs_t when,
mPointerGesture.currentGestureCoords[0].setAxisValue( mPointerGesture.currentGestureCoords[0].setAxisValue(
AMOTION_EVENT_AXIS_PRESSURE, 1.0f); AMOTION_EVENT_AXIS_PRESSURE, 1.0f);
mPointerController->setButtonState(BUTTON_STATE_PRIMARY);
if (mParameters.gestureMode == Parameters::GESTURE_MODE_SPOTS) { if (mParameters.gestureMode == Parameters::GESTURE_MODE_SPOTS) {
mPointerGesture.spotGesture = PointerControllerInterface::SPOT_GESTURE_TAP; mPointerGesture.spotGesture = PointerControllerInterface::SPOT_GESTURE_TAP;
mPointerGesture.spotIdBits.clear(); mPointerGesture.spotIdBits.clear();
@@ -3733,8 +3725,6 @@ bool TouchInputMapper::preparePointerGestures(nsecs_t when,
mPointerGesture.currentGestureMode = PointerGesture::NEUTRAL; mPointerGesture.currentGestureMode = PointerGesture::NEUTRAL;
mPointerGesture.currentGestureIdBits.clear(); mPointerGesture.currentGestureIdBits.clear();
mPointerController->setButtonState(0);
if (mParameters.gestureMode == Parameters::GESTURE_MODE_SPOTS) { if (mParameters.gestureMode == Parameters::GESTURE_MODE_SPOTS) {
mPointerGesture.spotGesture = PointerControllerInterface::SPOT_GESTURE_NEUTRAL; mPointerGesture.spotGesture = PointerControllerInterface::SPOT_GESTURE_NEUTRAL;
mPointerGesture.spotIdBits.clear(); mPointerGesture.spotIdBits.clear();
@@ -3815,8 +3805,6 @@ bool TouchInputMapper::preparePointerGestures(nsecs_t when,
mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_PRESSURE, mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_PRESSURE,
down ? 1.0f : 0.0f); down ? 1.0f : 0.0f);
mPointerController->setButtonState(down ? BUTTON_STATE_PRIMARY : 0);
if (mLastTouch.pointerCount == 0 && mCurrentTouch.pointerCount != 0) { if (mLastTouch.pointerCount == 0 && mCurrentTouch.pointerCount != 0) {
mPointerGesture.resetTap(); mPointerGesture.resetTap();
mPointerGesture.tapDownTime = when; mPointerGesture.tapDownTime = when;
@@ -4067,8 +4055,6 @@ bool TouchInputMapper::preparePointerGestures(nsecs_t when,
mPointerGesture.referenceGestureY); mPointerGesture.referenceGestureY);
mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_PRESSURE, 1.0f); mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_PRESSURE, 1.0f);
mPointerController->setButtonState(BUTTON_STATE_PRIMARY);
if (mParameters.gestureMode == Parameters::GESTURE_MODE_SPOTS) { if (mParameters.gestureMode == Parameters::GESTURE_MODE_SPOTS) {
mPointerGesture.spotGesture = PointerControllerInterface::SPOT_GESTURE_PRESS; mPointerGesture.spotGesture = PointerControllerInterface::SPOT_GESTURE_PRESS;
} }
@@ -4091,8 +4077,6 @@ bool TouchInputMapper::preparePointerGestures(nsecs_t when,
mPointerGesture.referenceGestureY); mPointerGesture.referenceGestureY);
mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_PRESSURE, 1.0f); mPointerGesture.currentGestureCoords[0].setAxisValue(AMOTION_EVENT_AXIS_PRESSURE, 1.0f);
mPointerController->setButtonState(0); // touch is not actually following the pointer
if (mParameters.gestureMode == Parameters::GESTURE_MODE_SPOTS) { if (mParameters.gestureMode == Parameters::GESTURE_MODE_SPOTS) {
mPointerGesture.spotGesture = PointerControllerInterface::SPOT_GESTURE_SWIPE; mPointerGesture.spotGesture = PointerControllerInterface::SPOT_GESTURE_SWIPE;
} }
@@ -4194,8 +4178,6 @@ bool TouchInputMapper::preparePointerGestures(nsecs_t when,
#endif #endif
} }
mPointerController->setButtonState(0); // touch is not actually following the pointer
if (mParameters.gestureMode == Parameters::GESTURE_MODE_SPOTS) { if (mParameters.gestureMode == Parameters::GESTURE_MODE_SPOTS) {
mPointerGesture.spotGesture = PointerControllerInterface::SPOT_GESTURE_FREEFORM; mPointerGesture.spotGesture = PointerControllerInterface::SPOT_GESTURE_FREEFORM;
} }
@@ -4225,6 +4207,8 @@ bool TouchInputMapper::preparePointerGestures(nsecs_t when,
} }
} }
mPointerController->setButtonState(mCurrentTouch.buttonState);
#if DEBUG_GESTURES #if DEBUG_GESTURES
LOGD("Gestures: finishPreviousGesture=%s, cancelPreviousGesture=%s, " LOGD("Gestures: finishPreviousGesture=%s, cancelPreviousGesture=%s, "
"currentGestureMode=%d, currentGestureIdBits=0x%08x, " "currentGestureMode=%d, currentGestureIdBits=0x%08x, "