Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08d8a676 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Dismiss sliding key input preview when touch event is canceled 

This is a follow up of Id807af31.

Bug: 7662486
Change-Id: I13895140f1214592257d0023c1450875a4885ee9
parent 8918cb46

java/src/com/android/inputmethod/keyboard/KeyboardView.java

+5 −0
Original line number Diff line number Diff line
@@ -860,6 +860,11 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { 
        mPreviewPlacerView.showSlidingKeyInputPreview(tracker);

    }



    @Override

    public void dismissSlidingKeyInputPreview() {

        mPreviewPlacerView.dismissSlidingKeyInputPreview();

    }



    public void showGestureFloatingPreviewText(final String gestureFloatingPreviewText) {

        locatePreviewPlacerView();

        mPreviewPlacerView.setGestureFloatingPreviewText(gestureFloatingPreviewText);

java/src/com/android/inputmethod/keyboard/PointerTracker.java

+2 −1
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element { 
        public void showKeyPreview(PointerTracker tracker);

        public void dismissKeyPreview(PointerTracker tracker);

        public void showSlidingKeyInputPreview(PointerTracker tracker);

        public void dismissSlidingKeyInputPreview();

        public void showGesturePreviewTrail(PointerTracker tracker, boolean isOldestTracker);

    }
@@ -881,7 +882,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element { 
    private void resetSlidingKeyInput() {

        mIsInSlidingKeyInput = false;

        mIsInSlidingKeyInputFromModifier = false;

        mDrawingProxy.showSlidingKeyInputPreview(this);

        mDrawingProxy.dismissSlidingKeyInputPreview();

    }



    private void onGestureMoveEvent(final int x, final int y, final long eventTime,

java/src/com/android/inputmethod/keyboard/internal/PreviewPlacerView.java

+4 −0
Original line number Diff line number Diff line
@@ -220,6 +220,10 @@ public final class PreviewPlacerView extends RelativeLayout { 
        invalidate();

    }



    public void dismissSlidingKeyInputPreview() {

        mShowSlidingKeyInputPreview = false;

    }



    @Override

    protected void onDetachedFromWindow() {

        freeOffscreenBuffer();