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

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

Pass MotionEvent to PointerTracker 

This is a one of groundwork to integrate gesture input.

Change-Id: I5b75c6978b51df91fdc384a9f6d1d5a5ddc563e2
parent 7bb8e95b

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

+4 −1
Original line number Diff line number Diff line
@@ -762,15 +762,18 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke 
                final PointerTracker tracker = PointerTracker.getPointerTracker(

                        pointerId, this);

                final int px, py;

                final MotionEvent motionEvent;

                if (mMoreKeysPanel != null

                        && tracker.mPointerId == mMoreKeysPanelPointerTrackerId) {

                    px = mMoreKeysPanel.translateX((int)me.getX(i));

                    py = mMoreKeysPanel.translateY((int)me.getY(i));

                    motionEvent = null;

                } else {

                    px = (int)me.getX(i);

                    py = (int)me.getY(i);

                    motionEvent = me;

                }

                tracker.onMoveEvent(px, py, eventTime);

                tracker.onMoveEvent(px, py, eventTime, motionEvent);

                if (ENABLE_USABILITY_STUDY_LOG) {

                    final float pointerSize = me.getSize(i);

                    final float pointerPressure = me.getPressure(i);

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

+2 −2
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ public class PointerTracker { 
            onUpEvent(x, y, eventTime);

            break;

        case MotionEvent.ACTION_MOVE:

            onMoveEvent(x, y, eventTime);

            onMoveEvent(x, y, eventTime, null);

            break;

        case MotionEvent.ACTION_CANCEL:

            onCancelEvent(x, y, eventTime);
@@ -553,7 +553,7 @@ public class PointerTracker { 
        mIsInSlidingKeyInput = true;

    }



    public void onMoveEvent(int x, int y, long eventTime) {

    public void onMoveEvent(int x, int y, long eventTime, MotionEvent me) {

        if (DEBUG_MOVE_EVENT)

            printTouchEvent("onMoveEvent:", x, y, eventTime);

        if (mKeyAlreadyProcessed)