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

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

Add PointerTracker.isOldestPointerInQueue 

Change-Id: Ic6f38253c94067ec7aa7b5add4452fa144fd9352
parent db906a7c

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

+2 −3
Original line number Diff line number Diff line
@@ -888,10 +888,9 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack 
        mDrawingHandler.dismissGestureFloatingPreviewText(mGestureFloatingPreviewTextLingerTimeout);

    }



    public void showGesturePreviewTrail(final PointerTracker tracker,

            final boolean isOldestTracker) {

    public void showGesturePreviewTrail(final PointerTracker tracker) {

        locatePreviewPlacerView();

        mPreviewPlacerView.invalidatePointer(tracker, isOldestTracker);

        mPreviewPlacerView.invalidatePointer(tracker);

    }



    // Note that this method is called from a non-UI thread.

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

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

        public void showSlidingKeyInputPreview(PointerTracker tracker);

        public void dismissSlidingKeyInputPreview();

        public void showGesturePreviewTrail(PointerTracker tracker, boolean isOldestTracker);

        public void showGesturePreviewTrail(PointerTracker tracker);

    }



    public interface TimerProxy {
@@ -709,8 +709,8 @@ public final class PointerTracker implements PointerTrackerQueue.Element { 
        return sPointerTrackerQueue.size();

    }



    private static boolean isOldestTrackerInQueue(final PointerTracker tracker) {

        return sPointerTrackerQueue.getOldestElement() == tracker;

    public boolean isOldestTrackerInQueue() {

        return sPointerTrackerQueue.getOldestElement() == this;

    }



    private void mayStartBatchInput(final Key key) {
@@ -732,7 +732,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element { 
            dismissAllMoreKeysPanels();

        }

        mTimerProxy.cancelLongPressTimer();

        mDrawingProxy.showGesturePreviewTrail(this, isOldestTrackerInQueue(this));

        mDrawingProxy.showGesturePreviewTrail(this);

    }



    public void updateBatchInputByTimer(final long eventTime) {
@@ -748,7 +748,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element { 
        if (mIsTrackingCanceled) {

            return;

        }

        mDrawingProxy.showGesturePreviewTrail(this, isOldestTrackerInQueue(this));

        mDrawingProxy.showGesturePreviewTrail(this);

    }



    private void updateBatchInput(final long eventTime) {
@@ -789,7 +789,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element { 
        if (mIsTrackingCanceled) {

            return;

        }

        mDrawingProxy.showGesturePreviewTrail(this, isOldestTrackerInQueue(this));

        mDrawingProxy.showGesturePreviewTrail(this);

    }



    private void cancelBatchInput() {

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

+2 −2
Original line number Diff line number Diff line
@@ -133,9 +133,9 @@ public final class PreviewPlacerView extends RelativeLayout { 
        mGestureFloatingPreviewText.setPreviewEnabled(drawsGestureFloatingPreviewText);

    }



    public void invalidatePointer(final PointerTracker tracker, final boolean isOldestTracker) {

    public void invalidatePointer(final PointerTracker tracker) {

        final boolean needsToUpdateLastPointer =

                isOldestTracker && mGestureFloatingPreviewText.isPreviewEnabled();

                tracker.isOldestTrackerInQueue() && mGestureFloatingPreviewText.isPreviewEnabled();

        if (needsToUpdateLastPointer) {

            mGestureFloatingPreviewText.setPreviewPosition(tracker);

        }