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

am c891d2b3: Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread

Browse Source 
Merge commit 'c891d2b3529b9cf24ef4781a585cd4784815e711' into gingerbread-plus-aosp

* commit 'c891d2b3529b9cf24ef4781a585cd4784815e711':
  Fix PointerLocationView when pointer ids are not zero-based.
This commit is contained in:
Jeff Brown
2010-09-12 20:47:50 -07:00
committed by Android Git Automerger
parent 8b11f30cb2 c891d2b352
commit fb8116f736
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/com/android/internal/widget/PointerLocationView.java
View File

@ -84,6 +84,7 @@ public class PointerLocationView extends View {
private boolean mCurDown; private boolean mCurDown;
private int mCurNumPointers; private int mCurNumPointers;
private int mMaxNumPointers; private int mMaxNumPointers;
private int mActivePointerId;
private final ArrayList<PointerState> mPointers = new ArrayList<PointerState>(); private final ArrayList<PointerState> mPointers = new ArrayList<PointerState>();
private final VelocityTracker mVelocity; private final VelocityTracker mVelocity;
@ -123,6 +124,7 @@ public class PointerLocationView extends View {
PointerState ps = new PointerState(); PointerState ps = new PointerState();
mPointers.add(ps); mPointers.add(ps);
mActivePointerId = 0;
mVelocity = VelocityTracker.obtain(); mVelocity = VelocityTracker.obtain();
@ -183,14 +185,15 @@ public class PointerLocationView extends View {
final int NP = mPointers.size(); final int NP = mPointers.size();
// Labels // Labels
if (NP > 0) { if (mActivePointerId >= 0) {
final PointerState ps = mPointers.get(0); final PointerState ps = mPointers.get(mActivePointerId);
canvas.drawRect(0, 0, itemW-1, bottom,mTextBackgroundPaint); canvas.drawRect(0, 0, itemW-1, bottom,mTextBackgroundPaint);
canvas.drawText(mText.clear() canvas.drawText(mText.clear()
.append("P: ").append(mCurNumPointers) .append("P: ").append(mCurNumPointers)
.append(" / ").append(mMaxNumPointers) .append(" / ").append(mMaxNumPointers)
.toString(), 1, base, mTextPaint); .toString(), 1, base, mTextPaint);
final int N = ps.mTraceCount; final int N = ps.mTraceCount;
if ((mCurDown && ps.mCurDown) || N == 0) { if ((mCurDown && ps.mCurDown) || N == 0) {
canvas.drawRect(itemW, 0, (itemW * 2) - 1, bottom, mTextBackgroundPaint); canvas.drawRect(itemW, 0, (itemW * 2) - 1, bottom, mTextBackgroundPaint);
@ -355,6 +358,11 @@ public class PointerLocationView extends View {
NP++; NP++;
} }
if (mActivePointerId < 0 ||
! mPointers.get(mActivePointerId).mCurDown) {
mActivePointerId = id;
}
final PointerState ps = mPointers.get(id); final PointerState ps = mPointers.get(id);
ps.mCurDown = true; ps.mCurDown = true;
if (mPrintCoords) { if (mPrintCoords) {
@ -396,6 +404,7 @@ public class PointerLocationView extends View {
} }
if (action == MotionEvent.ACTION_UP if (action == MotionEvent.ACTION_UP
|| action == MotionEvent.ACTION_CANCEL
|| (action & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_POINTER_UP) { || (action & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_POINTER_UP) {
final int index = (action & MotionEvent.ACTION_POINTER_INDEX_MASK) final int index = (action & MotionEvent.ACTION_POINTER_INDEX_MASK)
>> MotionEvent.ACTION_POINTER_INDEX_SHIFT; // will be 0 for UP >> MotionEvent.ACTION_POINTER_INDEX_SHIFT; // will be 0 for UP
@ -407,10 +416,14 @@ public class PointerLocationView extends View {
Log.i(TAG, mText.clear().append("Pointer ") Log.i(TAG, mText.clear().append("Pointer ")
.append(id + 1).append(": UP").toString()); .append(id + 1).append(": UP").toString());
} }
if (action == MotionEvent.ACTION_UP) { if (action == MotionEvent.ACTION_UP
|| action == MotionEvent.ACTION_CANCEL) {
mCurDown = false; mCurDown = false;
} else { } else {
if (mActivePointerId == id) {
mActivePointerId = event.getPointerId(index == 0 ? 1 : 0);
}
ps.addTrace(Float.NaN, Float.NaN); ps.addTrace(Float.NaN, Float.NaN);
} }
} }
@ -438,9 +451,9 @@ public class PointerLocationView extends View {
// HACK // HACK
// A quick and dirty string builder implementation optimized for GC. // A quick and dirty string builder implementation optimized for GC.
// Using the basic StringBuilder implementation causes the application grind to a halt when // Using String.format causes the application grind to a halt when
// more than a couple of pointers are down due to the number of temporary objects allocated // more than a couple of pointers are down due to the number of
// while formatting strings for drawing or logging. // temporary objects allocated while formatting strings for drawing or logging.
private static final class FasterStringBuilder { private static final class FasterStringBuilder {
private char[] mChars; private char[] mChars;
private int mLength; private int mLength;