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

Commit 77bcd6be authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Fix stuck gesture floatin preview text 

Bug: 7192483
Change-Id: Ic62253180446a625330966a114a6fabf74ab4ec8
parent 84c1bbd7

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

+9 −9
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ public class PreviewPlacerView extends RelativeLayout { 
    private final float mGestureFloatingPreviewHorizontalPadding;

    private final float mGestureFloatingPreviewVerticalPadding;

    private final float mGestureFloatingPreviewRoundRadius;

    /* package */ final int mGestureFloatingPreviewTextLingerTimeout;



    private int mXOrigin;

    private int mYOrigin;
@@ -78,11 +77,14 @@ public class PreviewPlacerView extends RelativeLayout { 
        private static final int MSG_UPDATE_GESTURE_PREVIEW_TRAIL = 1;



        private final Params mGesturePreviewTrailParams;

        private final int mGestureFloatingPreviewTextLingerTimeout;



        public DrawingHandler(final PreviewPlacerView outerInstance,

                final Params gesturePreviewTrailParams) {

                final Params gesturePreviewTrailParams,

                final int getstureFloatinPreviewTextLinerTimeout) {

            super(outerInstance);

            mGesturePreviewTrailParams = gesturePreviewTrailParams;

            mGestureFloatingPreviewTextLingerTimeout = getstureFloatinPreviewTextLinerTimeout;

        }



        @Override
@@ -105,10 +107,8 @@ public class PreviewPlacerView extends RelativeLayout { 


        public void dismissGestureFloatingPreviewText() {

            cancelDismissGestureFloatingPreviewText();

            final PreviewPlacerView placerView = getOuterInstance();

            sendMessageDelayed(

                    obtainMessage(MSG_DISMISS_GESTURE_FLOATING_PREVIEW_TEXT),

                    placerView.mGestureFloatingPreviewTextLingerTimeout);

            sendMessageDelayed(obtainMessage(MSG_DISMISS_GESTURE_FLOATING_PREVIEW_TEXT),

                    mGestureFloatingPreviewTextLingerTimeout);

        }



        private void cancelUpdateGestureTrailPreview() {
@@ -122,7 +122,6 @@ public class PreviewPlacerView extends RelativeLayout { 
        }



        public void cancelAllMessages() {

            cancelDismissGestureFloatingPreviewText();

            cancelUpdateGestureTrailPreview();

        }

    }
@@ -151,12 +150,13 @@ public class PreviewPlacerView extends RelativeLayout { 
                R.styleable.KeyboardView_gestureFloatingPreviewVerticalPadding, 0.0f);

        mGestureFloatingPreviewRoundRadius = keyboardViewAttr.getDimension(

                R.styleable.KeyboardView_gestureFloatingPreviewRoundRadius, 0.0f);

        mGestureFloatingPreviewTextLingerTimeout = keyboardViewAttr.getInt(

        final int gestureFloatingPreviewTextLingerTimeout = keyboardViewAttr.getInt(

                R.styleable.KeyboardView_gestureFloatingPreviewTextLingerTimeout, 0);

        mGesturePreviewTrailParams = new Params(keyboardViewAttr);

        keyboardViewAttr.recycle();



        mDrawingHandler = new DrawingHandler(this, mGesturePreviewTrailParams);

        mDrawingHandler = new DrawingHandler(this, mGesturePreviewTrailParams,

                gestureFloatingPreviewTextLingerTimeout);



        final Paint gesturePaint = new Paint();

        gesturePaint.setAntiAlias(true);