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

Merge from jb-mr1-aah-dev

Browse Source 
Change-Id: I4deb6ff1d3c9e00aefacbe772227bf43c139ecca
This commit is contained in:
Jean-Baptiste Queru
2012-09-28 16:43:52 -07:00
parent 2e35df06e7 737768c1b5
commit 3c45765a2a
2 changed files with 121 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
core/java/android/view/SimulatedTrackball.java Normal file
View File

@@ -0,0 +1,106 @@
/*
* Copyright (C) 2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.view;
/**
* This class creates trackball events from touchpad events.
* @see ViewRootImpl
*/
class SimulatedTrackball {
//The position of the previous touchpad event
private float mLastTouchpadXPosition;
private float mLastTouchpadYPosition;
//Where the touchpad was initially pressed
private float mTouchpadEnterXPosition;
private float mTouchpadEnterYPosition;
//When the last touchpad event occurred
private long mLastTouchPadStartTimeMs = 0;
//Change in position allowed during tap events
private float mTouchSlop;
private float mTouchSlopSquared;
//Has the TouchSlop constraint been invalidated
private boolean mAlwaysInTapRegion = true;
//Maximum difference in milliseconds between the down and up of a touch event
//for it to be considered a tap
//TODO:Read this value from a config file
private static final int MAX_TAP_TIME = 250;
public SimulatedTrackball(){
mTouchSlop = ViewConfiguration.getTouchSlop();
mTouchSlopSquared = mTouchSlop * mTouchSlop;
}
public void updateTrackballDirection(ViewRootImpl viewroot, MotionEvent event){
//Store what time the touchpad event occurred
final long time = event.getEventTime();
MotionEvent trackballEvent;
switch (event.getAction()) {
case MotionEvent.ACTION_HOVER_ENTER:
mLastTouchPadStartTimeMs = time;
mAlwaysInTapRegion = true;
mTouchpadEnterXPosition = event.getX();
mTouchpadEnterYPosition = event.getY();
break;
case MotionEvent.ACTION_HOVER_MOVE:
//Find the difference in position between the two most recent touchpad events
float deltaX = event.getX() - mLastTouchpadXPosition;
float deltaY = event.getY() - mLastTouchpadYPosition;
//TODO: Get simulated trackball configuration parameters
//Create a trackball event from recorded touchpad event data
trackballEvent = MotionEvent.obtain(mLastTouchPadStartTimeMs, time,
MotionEvent.ACTION_MOVE, deltaX / 50,
deltaY / 50, 0, 0, event.getMetaState(),
10f, 10f, event.getDeviceId(), 0);
trackballEvent.setSource(InputDevice.SOURCE_CLASS_TRACKBALL);
//Add the new event to event queue
viewroot.enqueueInputEvent(trackballEvent);
deltaX = event.getX() - mTouchpadEnterXPosition;
deltaY = event.getY() - mTouchpadEnterYPosition;
if (mTouchSlopSquared < deltaX * deltaX + deltaY * deltaY){
mAlwaysInTapRegion = false;
}
break;
case MotionEvent.ACTION_HOVER_EXIT:
if (time-mLastTouchPadStartTimeMs<MAX_TAP_TIME && mAlwaysInTapRegion){
//Trackball Down
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);
//Add the new event to event queue
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);
//Add the new event to event queue
viewroot.enqueueInputEvent(trackballEvent);
}
break;
}
//Store touch event position
mLastTouchpadXPosition = event.getX();
mLastTouchpadYPosition = event.getY();
}
}

17
core/java/android/view/ViewRootImpl.java
View File

@@ -145,6 +145,8 @@ public final class ViewRootImpl implements ViewParent,
final TrackballAxis mTrackballAxisX = new TrackballAxis();
final TrackballAxis mTrackballAxisY = new TrackballAxis();
final SimulatedTrackball mSimulatedTrackball = new SimulatedTrackball();
int mLastJoystickXDirection;
int mLastJoystickYDirection;
int mLastJoystickXKeyCode;
@@ -3380,7 +3382,6 @@ public final class ViewRootImpl implements ViewParent,
if (mInputEventConsistencyVerifier != null) {
mInputEventConsistencyVerifier.onGenericMotionEvent(event, 0);
}
if (mView != null && mAdded && (q.mFlags & QueuedInputEvent.FLAG_DELIVER_POST_IME) == 0) {
if (LOCAL_LOGV)
Log.v(TAG, "Dispatching generic motion " + event + " to " + mView);
@@ -3407,12 +3408,17 @@ public final class ViewRootImpl implements ViewParent,
private void deliverGenericMotionEventPostIme(QueuedInputEvent q) {
final MotionEvent event = (MotionEvent) q.mEvent;
final boolean isJoystick = (event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0;
final int source = event.getSource();
final boolean isJoystick = (source & InputDevice.SOURCE_CLASS_JOYSTICK) != 0;
final boolean isTouchPad = (source & InputDevice.SOURCE_CLASS_POSITION) != 0;
// If there is no view, then the event will not be handled.
if (mView == null || !mAdded) {
if (isJoystick) {
updateJoystickDirection(event, false);
} else if (isTouchPad) {
//Convert TouchPad motion into a TrackBall event
mSimulatedTrackball.updateTrackballDirection(this, event);
}
finishInputEvent(q, false);
return;
@@ -3422,6 +3428,9 @@ public final class ViewRootImpl implements ViewParent,
if (mView.dispatchGenericMotionEvent(event)) {
if (isJoystick) {
updateJoystickDirection(event, false);
} else if (isTouchPad) {
//Convert TouchPad motion into a TrackBall event
mSimulatedTrackball.updateTrackballDirection(this, event);
}
finishInputEvent(q, true);
return;
@@ -3432,6 +3441,10 @@ public final class ViewRootImpl implements ViewParent,
// those.
updateJoystickDirection(event, true);
finishInputEvent(q, true);
} else if (isTouchPad) {
//Convert TouchPad motion into a TrackBall event
mSimulatedTrackball.updateTrackballDirection(this, event);
finishInputEvent(q, true);
} else {
finishInputEvent(q, false);
}