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

Commit 3425c6c6 authored by Mady Mellor's avatar Mady Mellor Committed by android-build-merger
Browse files

Merge "Changes based on API council feedback for performContextClick" into nyc-dev 

am: 7c17e70f

* commit '7c17e70f':
  Changes based on API council feedback for performContextClick

Change-Id: Ief8c3036b93c28b27ba2f117ec656d38a1562fcf
parents 6b7635f7 7c17e70f

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -42670,6 +42670,7 @@ package android.view { 
    method protected boolean overScrollBy(int, int, int, int, int, int, int, int, boolean);

    method protected boolean overScrollBy(int, int, int, int, int, int, int, int, boolean);

    method public boolean performAccessibilityAction(int, android.os.Bundle);

    method public boolean performAccessibilityAction(int, android.os.Bundle);

    method public boolean performClick();

    method public boolean performClick();

    method public boolean performContextClick(float, float);

    method public boolean performContextClick();

    method public boolean performContextClick();

    method public boolean performHapticFeedback(int);

    method public boolean performHapticFeedback(int);

    method public boolean performHapticFeedback(int, int);

    method public boolean performHapticFeedback(int, int);

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -45668,6 +45668,7 @@ package android.view { 
    method protected boolean overScrollBy(int, int, int, int, int, int, int, int, boolean);

    method protected boolean overScrollBy(int, int, int, int, int, int, int, int, boolean);

    method public boolean performAccessibilityAction(int, android.os.Bundle);

    method public boolean performAccessibilityAction(int, android.os.Bundle);

    method public boolean performClick();

    method public boolean performClick();

    method public boolean performContextClick(float, float);

    method public boolean performContextClick();

    method public boolean performContextClick();

    method public boolean performHapticFeedback(int);

    method public boolean performHapticFeedback(int);

    method public boolean performHapticFeedback(int, int);

    method public boolean performHapticFeedback(int, int);

api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -42750,6 +42750,7 @@ package android.view { 
    method protected boolean overScrollBy(int, int, int, int, int, int, int, int, boolean);

    method protected boolean overScrollBy(int, int, int, int, int, int, int, int, boolean);

    method public boolean performAccessibilityAction(int, android.os.Bundle);

    method public boolean performAccessibilityAction(int, android.os.Bundle);

    method public boolean performClick();

    method public boolean performClick();

    method public boolean performContextClick(float, float);

    method public boolean performContextClick();

    method public boolean performContextClick();

    method public boolean performHapticFeedback(int);

    method public boolean performHapticFeedback(int);

    method public boolean performHapticFeedback(int, int);

    method public boolean performHapticFeedback(int, int);

core/java/android/view/View.java

+13 −1
Original line number Original line Diff line number Diff line
@@ -5695,6 +5695,18 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        return handled;

        return handled;

    }

    }




















    /**














     * Call this view's OnContextClickListener, if it is defined.














     *














     * @param x the x coordinate of the context click














     * @param y the y coordinate of the context click














     * @return True if there was an assigned OnContextClickListener that consumed the event, false














     *         otherwise.














     */














    public boolean performContextClick(float x, float y) {














        return performContextClick();














    }
























    /**







    /**











     * Call this view's OnContextClickListener, if it is defined.







     * Call this view's OnContextClickListener, if it is defined.











     *







     *










@@ -10044,7 +10056,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,









                if (isContextClickable() && !mInContextButtonPress && !mHasPerformedLongPress







                if (isContextClickable() && !mInContextButtonPress && !mHasPerformedLongPress











                        && (actionButton == MotionEvent.BUTTON_STYLUS_PRIMARY







                        && (actionButton == MotionEvent.BUTTON_STYLUS_PRIMARY











                        || actionButton == MotionEvent.BUTTON_SECONDARY)) {







                        || actionButton == MotionEvent.BUTTON_SECONDARY)) {











                    if (performContextClick()) {







                    if (performContextClick(event.getX(), event.getY())) {











                        mInContextButtonPress = true;







                        mInContextButtonPress = true;











                        setPressed(true, event.getX(), event.getY());







                        setPressed(true, event.getX(), event.getY());











                        removeTapCallback();







                        removeTapCallback();