am 1c820c41: Merge "Don\'t cancel gesture trail update drawing" into jb-mr1-dev
* commit '1c820c414606e10b5f4874548bb543b0ce78ecb5': Don't cancel gesture trail update drawingmain
commit
cde3eb02db
|
@ -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) {
|
||||
|
|
|
@ -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)) {
|
||||
|
|
Loading…
Reference in New Issue