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

Commit 8d572dd1 authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "New listener to recognize stylus button press gesture in GestureDetector"

parents 241e1196 a6b16454

api/current.txt

+7 −1
Original line number Diff line number Diff line
@@ -34468,6 +34468,7 @@ package android.view { 
    method public boolean onTouchEvent(android.view.MotionEvent);

    method public void setIsLongpressEnabled(boolean);

    method public void setOnDoubleTapListener(android.view.GestureDetector.OnDoubleTapListener);

    method public void setOnStylusButtonPressListener(android.view.GestureDetector.OnStylusButtonPressListener);

  }















  public static abstract interface GestureDetector.OnDoubleTapListener {









@@ -34485,7 +34486,11 @@ package android.view {













    method public abstract boolean onSingleTapUp(android.view.MotionEvent);















  }



























  public static class GestureDetector.SimpleOnGestureListener implements android.view.GestureDetector.OnDoubleTapListener android.view.GestureDetector.OnGestureListener {













  public static abstract interface GestureDetector.OnStylusButtonPressListener {













    method public abstract boolean onStylusButtonPress(android.view.MotionEvent);













  }

























  public static class GestureDetector.SimpleOnGestureListener implements android.view.GestureDetector.OnDoubleTapListener android.view.GestureDetector.OnGestureListener android.view.GestureDetector.OnStylusButtonPressListener {















    ctor public GestureDetector.SimpleOnGestureListener();















    method public boolean onDoubleTap(android.view.MotionEvent);















    method public boolean onDoubleTapEvent(android.view.MotionEvent);









@@ -34496,6 +34501,7 @@ package android.view {













    method public void onShowPress(android.view.MotionEvent);















    method public boolean onSingleTapConfirmed(android.view.MotionEvent);















    method public boolean onSingleTapUp(android.view.MotionEvent);













    method public boolean onStylusButtonPress(android.view.MotionEvent);















  }





























  public class Gravity {

























api/system-current.txt



+7
−1






























Original line number
Diff line number
Diff line








@@ -36633,6 +36633,7 @@ package android.view {













    method public boolean onTouchEvent(android.view.MotionEvent);















    method public void setIsLongpressEnabled(boolean);















    method public void setOnDoubleTapListener(android.view.GestureDetector.OnDoubleTapListener);













    method public void setOnStylusButtonPressListener(android.view.GestureDetector.OnStylusButtonPressListener);















  }





























  public static abstract interface GestureDetector.OnDoubleTapListener {









@@ -36650,7 +36651,11 @@ package android.view {













    method public abstract boolean onSingleTapUp(android.view.MotionEvent);















  }



























  public static class GestureDetector.SimpleOnGestureListener implements android.view.GestureDetector.OnDoubleTapListener android.view.GestureDetector.OnGestureListener {













  public static abstract interface GestureDetector.OnStylusButtonPressListener {













    method public abstract boolean onStylusButtonPress(android.view.MotionEvent);













  }

























  public static class GestureDetector.SimpleOnGestureListener implements android.view.GestureDetector.OnDoubleTapListener android.view.GestureDetector.OnGestureListener android.view.GestureDetector.OnStylusButtonPressListener {















    ctor public GestureDetector.SimpleOnGestureListener();















    method public boolean onDoubleTap(android.view.MotionEvent);















    method public boolean onDoubleTapEvent(android.view.MotionEvent);









@@ -36661,6 +36666,7 @@ package android.view {













    method public void onShowPress(android.view.MotionEvent);















    method public boolean onSingleTapConfirmed(android.view.MotionEvent);















    method public boolean onSingleTapUp(android.view.MotionEvent);













    method public boolean onStylusButtonPress(android.view.MotionEvent);















  }





























  public class Gravity {

























core/java/android/view/GestureDetector.java



+75
−13






























Original line number
Diff line number
Diff line








@@ -148,13 +148,31 @@ public class GestureDetector {













        boolean onDoubleTapEvent(MotionEvent e);















    }





























    /**













     * The listener that is used to notify when a stylus button press occurs.













     */













    public interface OnStylusButtonPressListener {













        /**













         * Notified when a stylus button press occurs. This is when the stylus













         * is touching the screen and the {@value MotionEvent#BUTTON_SECONDARY}













         * is pressed.













         *













         * @param e The motion event that occurred during the stylus button













         *            press.













         * @return true if the event is consumed, else false













         */













        boolean onStylusButtonPress(MotionEvent e);













    }





























    /**















     * A convenience class to extend when you only want to listen for a subset















     * of all the gestures. This implements all methods in the













     * {@link OnGestureListener} and {@link OnDoubleTapListener} but does













     * nothing and return {@code false} for all applicable methods.













     * {@link OnGestureListener}, {@link OnDoubleTapListener}, and {@link OnStylusButtonPressListener}













     * but does nothing and return {@code false} for all applicable methods.















     */













    public static class SimpleOnGestureListener implements OnGestureListener, OnDoubleTapListener {













    public static class SimpleOnGestureListener implements OnGestureListener, OnDoubleTapListener,













            OnStylusButtonPressListener {





























        public boolean onSingleTapUp(MotionEvent e) {















            return false;















        }










@@ -190,6 +208,10 @@ public class GestureDetector {













        public boolean onSingleTapConfirmed(MotionEvent e) {















            return false;















        }



























        public boolean onStylusButtonPress(MotionEvent e) {













            return false;













        }















    }































    private int mTouchSlopSquare;









@@ -211,10 +233,12 @@ public class GestureDetector {













    private final Handler mHandler;















    private final OnGestureListener mListener;















    private OnDoubleTapListener mDoubleTapListener;













    private OnStylusButtonPressListener mStylusButtonListener;































    private boolean mStillDown;















    private boolean mDeferConfirmSingleTap;















    private boolean mInLongPress;













    private boolean mInStylusButtonPress;















    private boolean mAlwaysInTapRegion;















    private boolean mAlwaysInBiggerTapRegion;


























@@ -358,6 +382,9 @@ public class GestureDetector {













        if (listener instanceof OnDoubleTapListener) {















            setOnDoubleTapListener((OnDoubleTapListener) listener);















        }













        if (listener instanceof OnStylusButtonPressListener) {













            setOnStylusButtonPressListener((OnStylusButtonPressListener) listener);













        }















        init(context);















    }















    










@@ -419,6 +446,19 @@ public class GestureDetector {













        mDoubleTapListener = onDoubleTapListener;















    }





























    /**













     * Sets the listener which will be called for stylus button related













     * gestures.













     *













     * @param onStylusButtonPressListener the listener invoked for all the













     *            callbacks, or null to stop listening for stylus button













     *            gestures.













     */













    public void setOnStylusButtonPressListener(













            OnStylusButtonPressListener onStylusButtonPressListener) {













        mStylusButtonListener = onStylusButtonPressListener;













    }





























    /**















     * Set whether longpress is enabled, if this is enabled when a user















     * presses and holds down you get a longpress event and nothing further.










@@ -512,7 +552,18 @@ public class GestureDetector {













            break;































        case MotionEvent.ACTION_DOWN:













            if (mDoubleTapListener != null) {













            if (mStylusButtonListener != null













                    && ev.getToolType(0) == MotionEvent.TOOL_TYPE_STYLUS













                    && (ev.getButtonState() & MotionEvent.BUTTON_SECONDARY) != 0) {













                if (mStylusButtonListener.onStylusButtonPress(ev)) {













                    mInStylusButtonPress = true;













                    handled = true;













                    mHandler.removeMessages(LONG_PRESS);













                    mHandler.removeMessages(TAP);













                }













            }



























            if (mDoubleTapListener != null && !mInStylusButtonPress) {















                boolean hadTapMessage = mHandler.hasMessages(TAP);















                if (hadTapMessage) mHandler.removeMessages(TAP);















                if ((mCurrentDownEvent != null) && (mPreviousUpEvent != null) && hadTapMessage &&










@@ -541,7 +592,7 @@ public class GestureDetector {













            mInLongPress = false;















            mDeferConfirmSingleTap = false;





























            if (mIsLongpressEnabled) {













            if (mIsLongpressEnabled && !mInStylusButtonPress) {















                mHandler.removeMessages(LONG_PRESS);















                mHandler.sendEmptyMessageAtTime(LONG_PRESS, mCurrentDownEvent.getDownTime()















                        + TAP_TIMEOUT + LONGPRESS_TIMEOUT);









@@ -551,7 +602,17 @@ public class GestureDetector {













            break;































        case MotionEvent.ACTION_MOVE:













            if (mInLongPress) {













            if (mStylusButtonListener != null && !mInStylusButtonPress && !mInLongPress













                    && ev.getToolType(0) == MotionEvent.TOOL_TYPE_STYLUS













                    && (ev.getButtonState() & MotionEvent.BUTTON_SECONDARY) != 0) {













                if (mStylusButtonListener.onStylusButtonPress(ev)) {













                    mInStylusButtonPress = true;













                    handled = true;













                    mHandler.removeMessages(LONG_PRESS);













                    mHandler.removeMessages(TAP);













                }













            }













            if (mInLongPress || mInStylusButtonPress) {















                break;















            }















            final float scrollX = mLastFocusX - focusX;










@@ -591,6 +652,9 @@ public class GestureDetector {













            } else if (mInLongPress) {















                mHandler.removeMessages(TAP);















                mInLongPress = false;













            } else if (mInStylusButtonPress) {













                mHandler.removeMessages(TAP);













                mInStylusButtonPress = false;















            } else if (mAlwaysInTapRegion) {















                handled = mListener.onSingleTapUp(ev);















                if (mDeferConfirmSingleTap && mDoubleTapListener != null) {










@@ -649,9 +713,8 @@ public class GestureDetector {













        mAlwaysInTapRegion = false;















        mAlwaysInBiggerTapRegion = false;















        mDeferConfirmSingleTap = false;













        if (mInLongPress) {















        mInLongPress = false;













        }













        mInStylusButtonPress = false;















    }































    private void cancelTaps() {









@@ -662,9 +725,8 @@ public class GestureDetector {













        mAlwaysInTapRegion = false;















        mAlwaysInBiggerTapRegion = false;















        mDeferConfirmSingleTap = false;













        if (mInLongPress) {















        mInLongPress = false;













        }













        mInStylusButtonPress = false;















    }































    private boolean isConsideredDoubleTap(MotionEvent firstDown, MotionEvent firstUp,