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

Commit 99cccf3d authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android Git Automerger
Browse files

am 7f9b3e62: am b2c4c730: Add debug facilities for gesture 

* commit '7f9b3e62':
  Add debug facilities for gesture
parents f5bb5231 7f9b3e62

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

+22 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.inputmethod.keyboard.internal; 


import android.content.res.TypedArray;

import android.graphics.Canvas;

import android.graphics.Color;

import android.graphics.Paint;

import android.graphics.Path;

import android.graphics.Rect;
@@ -35,12 +36,19 @@ import com.android.inputmethod.latin.ResizableIntArray; 
 * @attr ref R.styleable#MainKeyboardView_gesturePreviewTrailWidth

 */

final class GesturePreviewTrail {

    public static final boolean DBG_SHOW_POINTS = false;

    public static final int POINT_TYPE_SAMPLED = 0;

    public static final int POINT_TYPE_INTERPOLATED = 1;

    public static final int POINT_TYPE_COMPROMISED = 2;



    private static final int DEFAULT_CAPACITY = GestureStrokeWithPreviewPoints.PREVIEW_CAPACITY;



    // These three {@link ResizableIntArray}s should be synchronized by {@link #mEventTimes}.

    private final ResizableIntArray mXCoordinates = new ResizableIntArray(DEFAULT_CAPACITY);

    private final ResizableIntArray mYCoordinates = new ResizableIntArray(DEFAULT_CAPACITY);

    private final ResizableIntArray mEventTimes = new ResizableIntArray(DEFAULT_CAPACITY);

    private final ResizableIntArray mPointTypes = new ResizableIntArray(

            DBG_SHOW_POINTS ? DEFAULT_CAPACITY : 0);

    private int mCurrentStrokeId = -1;

    // The wall time of the zero value in {@link #mEventTimes}

    private long mCurrentTimeBase;
@@ -125,7 +133,7 @@ final class GesturePreviewTrail { 
        final int lastInterpolatedIndex = (strokeId == mCurrentStrokeId)

                ? mLastInterpolatedDrawIndex : trailSize;

        mLastInterpolatedDrawIndex = stroke.interpolateStrokeAndReturnStartIndexOfLastSegment(

                lastInterpolatedIndex, mEventTimes, mXCoordinates, mYCoordinates);

                lastInterpolatedIndex, mEventTimes, mXCoordinates, mYCoordinates, mPointTypes);

        if (strokeId != mCurrentStrokeId) {

            final int elapsedTime = (int)(downTime - mCurrentTimeBase);

            for (int i = mTrailStartIndex; i < trailSize; i++) {
@@ -204,6 +212,7 @@ final class GesturePreviewTrail { 
        final int[] eventTimes = mEventTimes.getPrimitiveArray();

        final int[] xCoords = mXCoordinates.getPrimitiveArray();

        final int[] yCoords = mYCoordinates.getPrimitiveArray();

        final int[] pointTypes = mPointTypes.getPrimitiveArray();

        final int sinceDown = (int)(SystemClock.uptimeMillis() - mCurrentTimeBase);

        int startIndex;

        for (startIndex = mTrailStartIndex; startIndex < trailSize; startIndex++) {
@@ -246,6 +255,17 @@ final class GesturePreviewTrail { 
                        final int alpha = getAlpha(elapsedTime, params);

                        paint.setAlpha(alpha);

                        canvas.drawPath(path, paint);

                        if (DBG_SHOW_POINTS) {

                            if (pointTypes[i] == POINT_TYPE_INTERPOLATED) {

                                paint.setColor(Color.RED);

                            } else if (pointTypes[i] == POINT_TYPE_SAMPLED) {

                                paint.setColor(Color.BLUE);

                            } else {

                                paint.setColor(Color.GREEN);

                            }

                            canvas.drawCircle(p1x - 1, p1y - 1, 2, paint);

                            paint.setColor(params.mTrailColor);

                        }

                    }

                }

                p1x = p2x;
@@ -265,6 +285,7 @@ final class GesturePreviewTrail { 
            mEventTimes.setLength(newSize);

            mXCoordinates.setLength(newSize);

            mYCoordinates.setLength(newSize);

            mPointTypes.setLength(newSize);

            // The start index of the last segment of the stroke

            // {@link mLastInterpolatedDrawIndex} should also be updated because all array

            // elements have just been shifted for compaction or been zeroed.

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

+7 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ public final class GestureStrokeWithPreviewPoints extends GestureStroke { 
     */

    public int interpolateStrokeAndReturnStartIndexOfLastSegment(final int lastInterpolatedIndex,

            final ResizableIntArray eventTimes, final ResizableIntArray xCoords,

            final ResizableIntArray yCoords) {

            final ResizableIntArray yCoords, final ResizableIntArray types) {

        final int size = mPreviewEventTimes.getLength();

        final int[] pt = mPreviewEventTimes.getPrimitiveArray();

        final int[] px = mPreviewXCoordinates.getPrimitiveArray();
@@ -189,11 +189,17 @@ public final class GestureStrokeWithPreviewPoints extends GestureStroke { 
                eventTimes.add(d1, (int)(dt * t) + t1);

                xCoords.add(d1, (int)mInterpolator.mInterpolatedX);

                yCoords.add(d1, (int)mInterpolator.mInterpolatedY);

                if (GesturePreviewTrail.DBG_SHOW_POINTS) {

                    types.add(d1, GesturePreviewTrail.POINT_TYPE_INTERPOLATED);

                }

                d1++;

            }

            eventTimes.add(d1, pt[p2]);

            xCoords.add(d1, px[p2]);

            yCoords.add(d1, py[p2]);

            if (GesturePreviewTrail.DBG_SHOW_POINTS) {

                types.add(d1, GesturePreviewTrail.POINT_TYPE_SAMPLED);

            }

        }

        return lastInterpolatedDrawIndex;

    }