Merge change Ib5736616 into eclair (359f0b09) · Commits · e / os / android_frameworks_base

services/java/com/android/server/InputDevice.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ public class InputDevice {

		// This is the last generated pointer data, ordered to match
		// mPointerIds.
		boolean mSkipLastPointers;
		int mLastNumPointers = 0;
		final int[] mLastData = new int[MotionEvent.NUM_SAMPLE_DATA * MAX_POINTERS];

		@@ -511,6 +512,11 @@ public class InputDevice {
		long curTimeNano, Display display, int orientation,
		int metaState) {

		if (mSkipLastPointers) {
		mSkipLastPointers = false;
		mLastNumPointers = 0;
		}

		if (mNextNumPointers <= 0 && mLastNumPointers <= 0) {
		return null;
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -689,7 +689,8 @@ public abstract class KeyInputQueue {
		ev, curTime, curTimeNano);

		if (doMotion && ms.mNextNumPointers > 0
		&& ms.mLastNumPointers == 0) {
		&& (ms.mLastNumPointers == 0
		\|\| ms.mSkipLastPointers)) {
		doMotion = !generateVirtualKeyDown(di,
		ev, curTime, curTimeNano);
		}
		@@ -703,7 +704,7 @@ public abstract class KeyInputQueue {
		me = ms.generateAbsMotion(di, curTime,
		curTimeNano, mDisplay,
		mOrientation, mGlobalMetaState);
		if (false) Log.v(TAG, "Absolute: x="
		if (DEBUG_POINTERS) Log.v(TAG, "Absolute: x="
		+ di.mAbs.mNextData[MotionEvent.SAMPLE_X]
		+ " y="
		+ di.mAbs.mNextData[MotionEvent.SAMPLE_Y]
		@@ -729,6 +730,7 @@ public abstract class KeyInputQueue {
		ms.mLastData, 0,
		num * MotionEvent.NUM_SAMPLE_DATA);
		ms.mLastNumPointers = num;
		ms.mSkipLastPointers = true;
		}

		ms.finish();