drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 359f0b09: Merge change Ib5736616 into eclair

Browse Source 
Merge commit '359f0b0998c26d2501346334d8850a2248920f0f' into eclair-plus-aosp

* commit '359f0b0998c26d2501346334d8850a2248920f0f':
  Fix issue #2191572: Difficulties drawing window shade
This commit is contained in:
Dianne Hackborn
2009-10-20 11:28:45 -07:00
committed by Android Git Automerger
parent ee4e57d55f 359f0b0998
commit 5e594d88df
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/InputDevice.java
View File

@ -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;
}

6
services/java/com/android/server/KeyInputQueue.java
View File

@ -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();