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

am 1c820c41: Merge "Don\'t cancel gesture trail update drawing" into jb-mr1-dev 

* commit '1c820c414606e10b5f4874548bb543b0ce78ecb5':
  Don't cancel gesture trail update drawing
main
Tadashi G. Takaoka 2012-09-25 22:53:01 -07:00 committed by Android Git Automerger
parent 2d67b03a68 1c820c4146
commit 5ebc2f8ad4
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -781,9 +781,6 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
public void cancelAllMessages() {
mDrawingHandler.cancelAllMessages();
if (mPreviewPlacerView != null) {
mPreviewPlacerView.cancelAllMessages();
}
}
private TextView getKeyPreviewText(final int pointerId) {

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

@ -101,29 +101,17 @@ public class PreviewPlacerView extends RelativeLayout {
}
}
private void cancelDismissGestureFloatingPreviewText() {
removeMessages(MSG_DISMISS_GESTURE_FLOATING_PREVIEW_TEXT);
}
public void dismissGestureFloatingPreviewText() {
cancelDismissGestureFloatingPreviewText();
removeMessages(MSG_DISMISS_GESTURE_FLOATING_PREVIEW_TEXT);
sendMessageDelayed(obtainMessage(MSG_DISMISS_GESTURE_FLOATING_PREVIEW_TEXT),
mGestureFloatingPreviewTextLingerTimeout);
}
private void cancelUpdateGestureTrailPreview() {
removeMessages(MSG_UPDATE_GESTURE_PREVIEW_TRAIL);
}
public void postUpdateGestureTrailPreview() {
cancelUpdateGestureTrailPreview();
removeMessages(MSG_UPDATE_GESTURE_PREVIEW_TRAIL);
sendMessageDelayed(obtainMessage(MSG_UPDATE_GESTURE_PREVIEW_TRAIL),
mGesturePreviewTrailParams.mUpdateInterval);
}
public void cancelAllMessages() {
cancelUpdateGestureTrailPreview();
}
}
public PreviewPlacerView(final Context context, final AttributeSet attrs) {
@ -278,10 +266,6 @@ public class PreviewPlacerView extends RelativeLayout {
mDrawingHandler.dismissGestureFloatingPreviewText();
}
public void cancelAllMessages() {
mDrawingHandler.cancelAllMessages();
}
private void drawGestureFloatingPreviewText(final Canvas canvas,
final String gestureFloatingPreviewText) {
if (TextUtils.isEmpty(gestureFloatingPreviewText)) {