nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 737e9150: Merge "Show gesture floating preview text at oldest finger" into jb-mr1-dev 

* commit '737e9150935e1058b2d7d6adcd1b7857fa7c37ca':
  Show gesture floating preview text at oldest finger
main
Tadashi G. Takaoka 2012-09-13 02:33:58 -07:00 committed by Android Git Automerger
parent a0fd2b4053 737e915093
commit 265083c85a
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/src/com/android/inputmethod/keyboard/KeyboardView.java
View File

@ -855,9 +855,10 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
} }
@Override @Override
public void showGesturePreviewTrail(final PointerTracker tracker) { public void showGesturePreviewTrail(final PointerTracker tracker,
final boolean isOldestTracker) {
locatePreviewPlacerView(); locatePreviewPlacerView();
mPreviewPlacerView.invalidatePointer(tracker); mPreviewPlacerView.invalidatePointer(tracker, isOldestTracker);
} }
@Override @Override

9
java/src/com/android/inputmethod/keyboard/PointerTracker.java
View File

@ -80,7 +80,7 @@ public class PointerTracker implements PointerTrackerQueue.Element {
public void invalidateKey(Key key); public void invalidateKey(Key key);
public void showKeyPreview(PointerTracker tracker); public void showKeyPreview(PointerTracker tracker);
public void dismissKeyPreview(PointerTracker tracker); public void dismissKeyPreview(PointerTracker tracker);
public void showGesturePreviewTrail(PointerTracker tracker); public void showGesturePreviewTrail(PointerTracker tracker, boolean isOldestTracker);
} }
public interface TimerProxy { public interface TimerProxy {
@ -550,7 +550,7 @@ public class PointerTracker implements PointerTrackerQueue.Element {
} }
sInGesture = true; sInGesture = true;
mListener.onStartBatchInput(); mListener.onStartBatchInput();
mDrawingProxy.showGesturePreviewTrail(this); mDrawingProxy.showGesturePreviewTrail(this, true /* isOldestTracker */);
} }
private void updateBatchInput(final long eventTime) { private void updateBatchInput(final long eventTime) {
@ -567,7 +567,8 @@ public class PointerTracker implements PointerTrackerQueue.Element {
mListener.onUpdateBatchInput(sAggregratedPointers); mListener.onUpdateBatchInput(sAggregratedPointers);
} }
} }
mDrawingProxy.showGesturePreviewTrail(this); final boolean isOldestTracker = sPointerTrackerQueue.getOldestElement() == this;
mDrawingProxy.showGesturePreviewTrail(this, isOldestTracker);
} }
private void endBatchInput() { private void endBatchInput() {
@ -584,7 +585,7 @@ public class PointerTracker implements PointerTrackerQueue.Element {
clearBatchInputPointsOfAllPointerTrackers(); clearBatchInputPointsOfAllPointerTrackers();
} }
} }
mDrawingProxy.showGesturePreviewTrail(this); mDrawingProxy.showGesturePreviewTrail(this, true /* isOldestTracker */);
} }
private static void abortBatchInput() { private static void abortBatchInput() {

4
java/src/com/android/inputmethod/keyboard/internal/PointerTrackerQueue.java
View File

@ -73,6 +73,10 @@ public class PointerTrackerQueue {
mArraySize = newSize; mArraySize = newSize;
} }
public synchronized Element getOldestElement() {
return (mArraySize == 0) ? null : mExpandableArrayOfActivePointers.get(0);
}
public synchronized void releaseAllPointersOlderThan(final Element pointer, public synchronized void releaseAllPointersOlderThan(final Element pointer,
final long eventTime) { final long eventTime) {
if (DEBUG) { if (DEBUG) {

8
java/src/com/android/inputmethod/keyboard/internal/PreviewPlacerView.java
View File

@ -188,7 +188,7 @@ public class PreviewPlacerView extends RelativeLayout {
mDrawsGestureFloatingPreviewText = drawsGestureFloatingPreviewText; mDrawsGestureFloatingPreviewText = drawsGestureFloatingPreviewText;
} }
public void invalidatePointer(final PointerTracker tracker) { public void invalidatePointer(final PointerTracker tracker, final boolean isOldestTracker) {
GesturePreviewTrail trail; GesturePreviewTrail trail;
synchronized (mGesturePreviewTrails) { synchronized (mGesturePreviewTrails) {
trail = mGesturePreviewTrails.get(tracker.mPointerId); trail = mGesturePreviewTrails.get(tracker.mPointerId);
@ -199,8 +199,10 @@ public class PreviewPlacerView extends RelativeLayout {
} }
trail.addStroke(tracker.getGestureStrokeWithPreviewTrail(), tracker.getDownTime()); trail.addStroke(tracker.getGestureStrokeWithPreviewTrail(), tracker.getDownTime());
mLastPointerX = tracker.getLastX(); if (isOldestTracker) {
mLastPointerY = tracker.getLastY(); mLastPointerX = tracker.getLastX();
mLastPointerY = tracker.getLastY();
}
// TODO: Should narrow the invalidate region. // TODO: Should narrow the invalidate region.
invalidate(); invalidate();
} }