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

Commit cc0c159e authored by Jeff Brown's avatar Jeff Brown
Browse files

Add new hover move action and scroll wheel plumbing. 

Added support for tracking the mouse position even when the mouse button
is not pressed.  To avoid confusing existing applications, mouse movements
are reported using the new ACTION_HOVER_MOVE action when the mouse button
is not pressed.

Added some more plumbing for the scroll wheel axes.  The values are
reported to Views but they are not yet handled by the framework.

Change-Id: I1706be850d25cf34e5adf880bbed5cc3265cf4b1
parent 6f2fba42

api/current.xml

+11 −0
Original line number Diff line number Diff line
@@ -217741,6 +217741,17 @@ 
 visibility="public"

>

</field>

<field name="ACTION_HOVER_MOVE"

 type="int"

 transient="false"

 volatile="false"

 value="7"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ACTION_MASK"

 type="int"

 transient="false"

core/java/android/view/MotionEvent.java

+36 −36
Original line number Diff line number Diff line
@@ -158,6 +158,14 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     */

    public static final int ACTION_POINTER_UP       = 6;



    /**

     * Constant for {@link #getAction}: A change happened but the pointer

     * is not down (unlike {@link #ACTION_MOVE}).  The motion contains the most

     * recent point, as well as any intermediate points since the last

     * hover move event.

     */

    public static final int ACTION_HOVER_MOVE       = 7;



    /**

     * Bits in the action code that represent a pointer index, used with

     * {@link #ACTION_POINTER_DOWN} and {@link #ACTION_POINTER_UP}.  Shifting
@@ -269,9 +277,8 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     * <li>For a touch screen, reports the absolute X screen position of the center of

     * the touch contact area.  The units are display pixels.

     * <li>For a touch pad, reports the absolute X surface position of the center of the touch

     * contact area.  The units are device-specific because the touch pad is not necessarily

     * associated with a display.  Use {@link InputDevice#getMotionRange(int)} to query

     * the effective range of values.

     * contact area.  The units are device-dependent; use {@link InputDevice#getMotionRange(int)}

     * to query the effective range of values.

     * <li>For a mouse, reports the absolute X screen position of the mouse pointer.

     * The units are display pixels.

     * <li>For a trackball, reports the relative horizontal displacement of the trackball.
@@ -317,7 +324,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     * Constant used to identify the Pressure axis of a motion event.

     * <p>

     * <ul>

     * <li>For a touch screen or touch pad, reports the approximate pressure applied to the device

     * <li>For a touch screen or touch pad, reports the approximate pressure applied to the surface

     * by a finger or other tool.  The value is normalized to a range from

     * 0 (no pressure at all) to 1 (normal pressure), although values higher than 1

     * may be generated depending on the calibration of the input device.
@@ -342,7 +349,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     * <li>For a touch screen or touch pad, reports the approximate size of the contact area in

     * relation to the maximum detectable size for the device.  The value is normalized

     * to a range from 0 (smallest detectable size) to 1 (largest detectable size),

     * although it is not a linear scale.  This value is of very limited use.

     * although it is not a linear scale.  This value is of limited use.

     * To obtain calibrated size information, use

     * {@link #AXIS_TOUCH_MAJOR} or {@link #AXIS_TOOL_MAJOR}.

     * </ul>
@@ -475,7 +482,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     * Constant used to identify the Vertical Scroll axis of a motion event.

     * <p>

     * <ul>

     * <li>For a mouse, reports the relative movement of vertical scroll wheel.

     * <li>For a mouse, reports the relative movement of the vertical scroll wheel.

     * The value is normalized to a range from -1.0 (up) to 1.0 (down).

     * </ul>

     * </p><p>
@@ -493,7 +500,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     * Constant used to identify the Horizontal Scroll axis of a motion event.

     * <p>

     * <ul>

     * <li>For a mouse, reports the relative movement of horizontal scroll wheel.

     * <li>For a mouse, reports the relative movement of the horizontal scroll wheel.

     * The value is normalized to a range from -1.0 (left) to 1.0 (right).

     * </ul>

     * </p><p>
@@ -969,9 +976,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     * a stream of position events.  This must be obtained from {@link SystemClock#uptimeMillis()}.

     * @param eventTime The the time (in ms) when this specific event was generated.  This 

     * must be obtained from {@link SystemClock#uptimeMillis()}.

     * @param action The kind of action being performed -- one of either

     * {@link #ACTION_DOWN}, {@link #ACTION_MOVE}, {@link #ACTION_UP}, or

     * {@link #ACTION_CANCEL}.

     * @param action The kind of action being performed, such as {@link #ACTION_DOWN}.

     * @param pointers The number of points that will be in this event.

     * @param pointerIds An array of <em>pointers</em> values providing

     * an identifier for each pointer.
@@ -1010,9 +1015,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     * a stream of position events.  This must be obtained from {@link SystemClock#uptimeMillis()}.

     * @param eventTime  The the time (in ms) when this specific event was generated.  This

     * must be obtained from {@link SystemClock#uptimeMillis()}.

     * @param action The kind of action being performed -- one of either

     * {@link #ACTION_DOWN}, {@link #ACTION_MOVE}, {@link #ACTION_UP}, or

     * {@link #ACTION_CANCEL}.

     * @param action The kind of action being performed, such as {@link #ACTION_DOWN}.

     * @param x The X coordinate of this event.

     * @param y The Y coordinate of this event.

     * @param pressure The current pressure of this event.  The pressure generally
@@ -1062,9 +1065,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     * a stream of position events.  This must be obtained from {@link SystemClock#uptimeMillis()}.

     * @param eventTime  The the time (in ms) when this specific event was generated.  This

     * must be obtained from {@link SystemClock#uptimeMillis()}.

     * @param action The kind of action being performed -- one of either

     * {@link #ACTION_DOWN}, {@link #ACTION_MOVE}, {@link #ACTION_UP}, or

     * {@link #ACTION_CANCEL}.

     * @param action The kind of action being performed, such as {@link #ACTION_DOWN}.

     * @param pointers The number of pointers that are active in this event.

     * @param x The X coordinate of this event.

     * @param y The Y coordinate of this event.
@@ -1106,9 +1107,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     * a stream of position events.  This must be obtained from {@link SystemClock#uptimeMillis()}.

     * @param eventTime  The the time (in ms) when this specific event was generated.  This

     * must be obtained from {@link SystemClock#uptimeMillis()}.

     * @param action The kind of action being performed -- one of either

     * {@link #ACTION_DOWN}, {@link #ACTION_MOVE}, {@link #ACTION_UP}, or

     * {@link #ACTION_CANCEL}.

     * @param action The kind of action being performed, such as {@link #ACTION_DOWN}.

     * @param x The X coordinate of this event.

     * @param y The Y coordinate of this event.

     * @param metaState The state of any meta / modifier keys that were in effect when
@@ -1203,23 +1202,20 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
    }



    /**

     * Return the kind of action being performed -- one of either

     * {@link #ACTION_DOWN}, {@link #ACTION_MOVE}, {@link #ACTION_UP}, or

     * {@link #ACTION_CANCEL}.  Consider using {@link #getActionMasked}

     * and {@link #getActionIndex} to retrieve the separate masked action

     * and pointer index.

     * Return the kind of action being performed.

     * Consider using {@link #getActionMasked} and {@link #getActionIndex} to retrieve

     * the separate masked action and pointer index.

     * @return The action, such as {@link #ACTION_DOWN} or

     * the combination of {@link #ACTION_POINTER_DOWN} with a shifted pointer index.

     */

    public final int getAction() {

        return nativeGetAction(mNativePtr);

    }



    /**

     * Return the masked action being performed, without pointer index

     * information.  May be any of the actions: {@link #ACTION_DOWN},

     * {@link #ACTION_MOVE}, {@link #ACTION_UP}, {@link #ACTION_CANCEL},

     * {@link #ACTION_POINTER_DOWN}, or {@link #ACTION_POINTER_UP}.

     * Use {@link #getActionIndex} to return the index associated with

     * pointer actions.

     * Return the masked action being performed, without pointer index information.

     * Use {@link #getActionIndex} to return the index associated with pointer actions.

     * @return The action, such as {@link #ACTION_DOWN} or {@link #ACTION_POINTER_DOWN}.

     */

    public final int getActionMasked() {

        return nativeGetAction(mNativePtr) & ACTION_MASK;
@@ -1228,10 +1224,12 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
    /**

     * For {@link #ACTION_POINTER_DOWN} or {@link #ACTION_POINTER_UP}

     * as returned by {@link #getActionMasked}, this returns the associated

     * pointer index.  The index may be used with {@link #getPointerId(int)},

     * pointer index.

     * The index may be used with {@link #getPointerId(int)},

     * {@link #getX(int)}, {@link #getY(int)}, {@link #getPressure(int)},

     * and {@link #getSize(int)} to get information about the pointer that has

     * gone down or up.

     * @return The index associated with the action.

     */

    public final int getActionIndex() {

        return (nativeGetAction(mNativePtr) & ACTION_POINTER_INDEX_MASK)
@@ -2096,7 +2094,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     * current location, position and size is updated to the new values.

     * The current values in the event are added to a list of historical values.

     *

     * Only applies to {@link #ACTION_MOVE} events.

     * Only applies to {@link #ACTION_MOVE} or {@link #ACTION_HOVER_MOVE} events.

     *

     * @param eventTime The time stamp (in ms) for this data.

     * @param x The new X position.
@@ -2123,7 +2121,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     * current location, position and size is updated to the new values.

     * The current values in the event are added to a list of historical values.

     *

     * Only applies to {@link #ACTION_MOVE} events.

     * Only applies to {@link #ACTION_MOVE} or {@link #ACTION_HOVER_MOVE} events.

     *

     * @param eventTime The time stamp (in ms) for this data.

     * @param pointerCoords The new pointer coordinates.
@@ -2178,6 +2176,8 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
                return "ACTION_CANCEL";

            case ACTION_MOVE:

                return "ACTION_MOVE";

            case ACTION_HOVER_MOVE:

                return "ACTION_HOVER_MOVE";

        }

        int index = (action & ACTION_POINTER_INDEX_MASK) >> ACTION_POINTER_INDEX_SHIFT;

        switch (action & ACTION_MASK) {
@@ -2203,8 +2203,8 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
    }



    /**

     * Gets an axis by its symbolic name such as "KEYCODE_A" or an

     * equivalent numeric constant such as "1001".

     * Gets an axis by its symbolic name such as "AXIS_X" or an

     * equivalent numeric constant such as "42".

     *

     * @param symbolicName The symbolic name of the axis.

     * @return The axis or -1 if not found.

core/java/android/view/ViewGroup.java

+12 −4
Original line number Diff line number Diff line
@@ -1166,7 +1166,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        final int actionMasked = action & MotionEvent.ACTION_MASK;



        // Handle an initial down.

        if (actionMasked == MotionEvent.ACTION_DOWN) {

        if (actionMasked == MotionEvent.ACTION_DOWN

                || actionMasked == MotionEvent.ACTION_HOVER_MOVE) {

            // Throw away all previous state when starting a new touch gesture.

            // The framework may have dropped the up or cancel event for the previous gesture

            // due to an app switch, ANR, or some other state change.
@@ -1176,7 +1177,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 


        // Check for interception.

        final boolean intercepted;

        if (actionMasked == MotionEvent.ACTION_DOWN || mFirstTouchTarget != null) {

        if (actionMasked == MotionEvent.ACTION_DOWN

                || actionMasked == MotionEvent.ACTION_HOVER_MOVE

                || mFirstTouchTarget != null) {

            final boolean disallowIntercept = (mGroupFlags & FLAG_DISALLOW_INTERCEPT) != 0;

            if (!disallowIntercept) {

                intercepted = onInterceptTouchEvent(ev);
@@ -1198,7 +1201,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        boolean alreadyDispatchedToNewTouchTarget = false;

        if (!canceled && !intercepted) {

            if (actionMasked == MotionEvent.ACTION_DOWN

                    || (split && actionMasked == MotionEvent.ACTION_POINTER_DOWN)) {

                    || (split && actionMasked == MotionEvent.ACTION_POINTER_DOWN)

                    || actionMasked == MotionEvent.ACTION_HOVER_MOVE) {

                final int actionIndex = ev.getActionIndex(); // always 0 for down

                final int idBitsToAssign = split ? 1 << ev.getPointerId(actionIndex)

                        : TouchTarget.ALL_POINTER_IDS;
@@ -1299,7 +1303,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        }



        // Update list of touch targets for pointer up or cancel, if needed.

        if (canceled || actionMasked == MotionEvent.ACTION_UP) {

        if (canceled

                || actionMasked == MotionEvent.ACTION_UP

                || actionMasked == MotionEvent.ACTION_HOVER_MOVE) {

            resetTouchState();

        } else if (split && actionMasked == MotionEvent.ACTION_POINTER_UP) {

            final int actionIndex = ev.getActionIndex();
@@ -1542,6 +1548,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
            final int newAction;

            if (cancel) {

                newAction = MotionEvent.ACTION_CANCEL;

            } else if (oldAction == MotionEvent.ACTION_HOVER_MOVE) {

                newAction = MotionEvent.ACTION_HOVER_MOVE;

            } else {

                final int oldMaskedAction = oldAction & MotionEvent.ACTION_MASK;

                if (oldMaskedAction == MotionEvent.ACTION_POINTER_DOWN

core/java/com/android/internal/widget/PointerLocationView.java

+21 −12
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.view.MotionEvent; 
import android.view.VelocityTracker;

import android.view.View;

import android.view.ViewConfiguration;

import android.view.MotionEvent.PointerCoords;



import java.util.ArrayList;
@@ -43,7 +44,7 @@ public class PointerLocationView extends View { 
        private boolean mCurDown;

        

        // Most recent coordinates.

        private MotionEvent.PointerCoords mCoords = new MotionEvent.PointerCoords();

        private PointerCoords mCoords = new PointerCoords();

        

        // Most recent velocity.

        private float mXVelocity;
@@ -86,6 +87,7 @@ public class PointerLocationView extends View { 
    private int mMaxNumPointers;

    private int mActivePointerId;

    private final ArrayList<PointerState> mPointers = new ArrayList<PointerState>();

    private final PointerCoords mHoverCoords = new PointerCoords();

    

    private final VelocityTracker mVelocity;
@@ -387,8 +389,10 @@ public class PointerLocationView extends View { 
            

            final int NI = event.getPointerCount();



            final boolean hover = (action == MotionEvent.ACTION_HOVER_MOVE);

            mCurDown = action != MotionEvent.ACTION_UP

                    && action != MotionEvent.ACTION_CANCEL;

                    && action != MotionEvent.ACTION_CANCEL

                    && !hover;

            mCurNumPointers = mCurDown ? NI : 0;

            if (mMaxNumPointers < mCurNumPointers) {

                mMaxNumPointers = mCurNumPointers;
@@ -399,23 +403,28 @@ public class PointerLocationView extends View { 
            

            for (int i=0; i<NI; i++) {

                final int id = event.getPointerId(i);

                final PointerState ps = mPointers.get(id);

                final PointerState ps = hover ? null : mPointers.get(id);

                final PointerCoords coords = ps != null ? ps.mCoords : mHoverCoords;

                final int N = event.getHistorySize();

                for (int j=0; j<N; j++) {

                    event.getHistoricalPointerCoords(i, j, ps.mCoords);

                    event.getHistoricalPointerCoords(i, j, coords);

                    if (mPrintCoords) {

                        logPointerCoords(ps.mCoords, id);

                        logPointerCoords(coords, id);

                    }

                    if (ps != null) {

                        ps.addTrace(event.getHistoricalX(i, j), event.getHistoricalY(i, j));

                    }

                event.getPointerCoords(i, ps.mCoords);

                }

                event.getPointerCoords(i, coords);

                if (mPrintCoords) {

                    logPointerCoords(ps.mCoords, id);

                    logPointerCoords(coords, id);

                }

                ps.addTrace(ps.mCoords.x, ps.mCoords.y);

                if (ps != null) {

                    ps.addTrace(coords.x, coords.y);

                    ps.mXVelocity = mVelocity.getXVelocity(id);

                    ps.mYVelocity = mVelocity.getYVelocity(id);

                }

            }

            

            if (action == MotionEvent.ACTION_UP

                    || action == MotionEvent.ACTION_CANCEL

core/jni/android_view_MotionEvent.cpp

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static void pointerCoordsToNative(JNIEnv* env, jobject pointerCoordsObj, 


            uint32_t index = 0;

            do {

                uint32_t axis = __builtin_ctz(bits);

                uint32_t axis = __builtin_ctzll(bits);

                uint64_t axisBit = 1LL << axis;

                bits &= ~axisBit;

                outRawPointerCoords->setAxisValue(axis, values[index++]);
@@ -298,7 +298,7 @@ static void pointerCoordsFromNative(JNIEnv* env, const PointerCoords* rawPointer 
        const float* values = rawPointerCoords->values;

        uint32_t index = 0;

        do {

            uint32_t axis = __builtin_ctz(remainingBits);

            uint32_t axis = __builtin_ctzll(remainingBits);

            uint64_t axisBit = 1LL << axis;

            remainingBits &= ~axisBit;

            outBits |= axisBit;