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

am 36c7b2d8: am 81d2e937: Merge "Fix stuck gesture floatin preview text" into jb-mr1-dev 

* commit '36c7b2d82cce5b5bb11c127b32fb57f0e8b9ca11':
  Fix stuck gesture floatin preview text
main
Tadashi G. Takaoka 2012-09-20 09:29:35 -07:00 committed by Android Git Automerger
parent 72ce105e15 36c7b2d82c
commit 669bf3827a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,6 @@ public class PreviewPlacerView extends RelativeLayout {
private final float mGestureFloatingPreviewHorizontalPadding; private final float mGestureFloatingPreviewHorizontalPadding;
private final float mGestureFloatingPreviewVerticalPadding; private final float mGestureFloatingPreviewVerticalPadding;
private final float mGestureFloatingPreviewRoundRadius; private final float mGestureFloatingPreviewRoundRadius;
/* package */ final int mGestureFloatingPreviewTextLingerTimeout;
private int mXOrigin; private int mXOrigin;
private int mYOrigin; private int mYOrigin;
@ -78,11 +77,14 @@ public class PreviewPlacerView extends RelativeLayout {
private static final int MSG_UPDATE_GESTURE_PREVIEW_TRAIL = 1; private static final int MSG_UPDATE_GESTURE_PREVIEW_TRAIL = 1;
private final Params mGesturePreviewTrailParams; private final Params mGesturePreviewTrailParams;
private final int mGestureFloatingPreviewTextLingerTimeout;
public DrawingHandler(final PreviewPlacerView outerInstance, public DrawingHandler(final PreviewPlacerView outerInstance,
final Params gesturePreviewTrailParams) { final Params gesturePreviewTrailParams,
final int getstureFloatinPreviewTextLinerTimeout) {
super(outerInstance); super(outerInstance);
mGesturePreviewTrailParams = gesturePreviewTrailParams; mGesturePreviewTrailParams = gesturePreviewTrailParams;
mGestureFloatingPreviewTextLingerTimeout = getstureFloatinPreviewTextLinerTimeout;
} }
@Override @Override
@ -105,10 +107,8 @@ public class PreviewPlacerView extends RelativeLayout {
public void dismissGestureFloatingPreviewText() { public void dismissGestureFloatingPreviewText() {
cancelDismissGestureFloatingPreviewText(); cancelDismissGestureFloatingPreviewText();
final PreviewPlacerView placerView = getOuterInstance(); sendMessageDelayed(obtainMessage(MSG_DISMISS_GESTURE_FLOATING_PREVIEW_TEXT),
sendMessageDelayed( mGestureFloatingPreviewTextLingerTimeout);
obtainMessage(MSG_DISMISS_GESTURE_FLOATING_PREVIEW_TEXT),
placerView.mGestureFloatingPreviewTextLingerTimeout);
} }
private void cancelUpdateGestureTrailPreview() { private void cancelUpdateGestureTrailPreview() {
@ -122,7 +122,6 @@ public class PreviewPlacerView extends RelativeLayout {
} }
public void cancelAllMessages() { public void cancelAllMessages() {
cancelDismissGestureFloatingPreviewText();
cancelUpdateGestureTrailPreview(); cancelUpdateGestureTrailPreview();
} }
} }
@ -151,12 +150,13 @@ public class PreviewPlacerView extends RelativeLayout {
R.styleable.KeyboardView_gestureFloatingPreviewVerticalPadding, 0.0f); R.styleable.KeyboardView_gestureFloatingPreviewVerticalPadding, 0.0f);
mGestureFloatingPreviewRoundRadius = keyboardViewAttr.getDimension( mGestureFloatingPreviewRoundRadius = keyboardViewAttr.getDimension(
R.styleable.KeyboardView_gestureFloatingPreviewRoundRadius, 0.0f); R.styleable.KeyboardView_gestureFloatingPreviewRoundRadius, 0.0f);
mGestureFloatingPreviewTextLingerTimeout = keyboardViewAttr.getInt( final int gestureFloatingPreviewTextLingerTimeout = keyboardViewAttr.getInt(
R.styleable.KeyboardView_gestureFloatingPreviewTextLingerTimeout, 0); R.styleable.KeyboardView_gestureFloatingPreviewTextLingerTimeout, 0);
mGesturePreviewTrailParams = new Params(keyboardViewAttr); mGesturePreviewTrailParams = new Params(keyboardViewAttr);
keyboardViewAttr.recycle(); keyboardViewAttr.recycle();
mDrawingHandler = new DrawingHandler(this, mGesturePreviewTrailParams); mDrawingHandler = new DrawingHandler(this, mGesturePreviewTrailParams,
gestureFloatingPreviewTextLingerTimeout);
final Paint gesturePaint = new Paint(); final Paint gesturePaint = new Paint();
gesturePaint.setAntiAlias(true); gesturePaint.setAntiAlias(true);