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

Commit 51dccf92 authored by Justin Ghan's avatar Justin Ghan Committed by Android (Google) Code Review
Browse files

Merge changes I69a66dcf,I19b4ee8b into main 

* changes:
  Improve HandwritingInitiator handling of disabled views
  Small refactor of HandwritingInitiator State
parents 3d7538ff b51f07d7

core/java/android/view/HandwritingInitiator.java

+13 −20
Original line number Diff line number Diff line
@@ -188,8 +188,7 @@ public class HandwritingInitiator { 
                // check whether the stylus we are tracking goes up.

                if (mState != null) {

                    mState.mShouldInitHandwriting = false;

                    if (!mState.mHasInitiatedHandwriting

                            && !mState.mHasPreparedHandwritingDelegation) {

                    if (!mState.mHandled) {

                        // The user just did a click, long click or another stylus gesture,

                        // show hover icon again for the connected view.

                        mShowHoverIconForConnectedView = true;
@@ -204,16 +203,14 @@ public class HandwritingInitiator { 
                // Either we've already tried to initiate handwriting, or the ongoing MotionEvent

                // sequence is considered to be tap, long-click or other gestures.

                if (!mState.mShouldInitHandwriting || mState.mExceedHandwritingSlop) {

                    return mState.mHasInitiatedHandwriting

                            || mState.mHasPreparedHandwritingDelegation;

                    return mState.mHandled;

                }



                final long timeElapsed =

                        motionEvent.getEventTime() - mState.mStylusDownTimeInMillis;

                if (timeElapsed > mHandwritingTimeoutInMillis) {

                    mState.mShouldInitHandwriting = false;

                    return mState.mHasInitiatedHandwriting

                            || mState.mHasPreparedHandwritingDelegation;

                    return mState.mHandled;

                }



                final int pointerIndex = motionEvent.findPointerIndex(mState.mStylusPointerId);
@@ -223,7 +220,7 @@ public class HandwritingInitiator { 
                    mState.mExceedHandwritingSlop = true;

                    View candidateView = findBestCandidateView(mState.mStylusDownX,

                            mState.mStylusDownY, /* isHover */ false);

                    if (candidateView != null) {

                    if (candidateView != null && candidateView.isEnabled()) {

                        if (candidateView == getConnectedOrFocusedView()) {

                            if (!mInitiateWithoutConnection && !candidateView.hasFocus()) {

                                requestFocusWithoutReveal(candidateView);
@@ -246,7 +243,7 @@ public class HandwritingInitiator { 
                        }

                    }

                }

                return mState.mHasInitiatedHandwriting || mState.mHasPreparedHandwritingDelegation;

                return mState.mHandled;

        }

        return false;

    }
@@ -382,7 +379,7 @@ public class HandwritingInitiator { 
    @VisibleForTesting

    public void startHandwriting(@NonNull View view) {

        mImm.startStylusHandwriting(view);

        mState.mHasInitiatedHandwriting = true;

        mState.mHandled = true;

        mState.mShouldInitHandwriting = false;

        mShowHoverIconForConnectedView = false;

        if (view instanceof TextView) {
@@ -402,13 +399,12 @@ public class HandwritingInitiator { 
            mImm.startConnectionlessStylusHandwritingForDelegation(

                    view, getCursorAnchorInfoForConnectionless(view), delegatePackageName,

                    view::post, new DelegationCallback(view, delegatePackageName));

            mState.mHasInitiatedHandwriting = true;

            mState.mShouldInitHandwriting = false;

        } else {

            mImm.prepareStylusHandwritingDelegation(view, delegatePackageName);

            view.getHandwritingDelegatorCallback().run();

            mState.mHasPreparedHandwritingDelegation = true;

        }

        mState.mHandled = true;

    }



    /**
@@ -455,7 +451,7 @@ public class HandwritingInitiator { 


    private void onDelegationAccepted(View view) {

        if (mState != null) {

            mState.mHasInitiatedHandwriting = true;

            mState.mHandled = true;

            mState.mShouldInitHandwriting = false;

        }

        if (view instanceof TextView) {
@@ -795,12 +791,12 @@ public class HandwritingInitiator { 
         * This boolean will be set to false, and it won't request to start handwriting.

         */

        private boolean mShouldInitHandwriting;



        /**

         * Whether handwriting mode has already been initiated for the current MotionEvent sequence.

         * Whether the current MotionEvent sequence has been handled by the handwriting initiator,

         * either by initiating handwriting mode, or by preparing handwriting delegation.

         */

        private boolean mHasInitiatedHandwriting;



        private boolean mHasPreparedHandwritingDelegation;

        private boolean mHandled;



        /**

         * Whether the current ongoing stylus MotionEvent sequence already exceeds the
@@ -838,8 +834,7 @@ public class HandwritingInitiator { 
            mStylusDownY = motionEvent.getY(actionIndex);



            mShouldInitHandwriting = true;

            mHasInitiatedHandwriting = false;

            mHasPreparedHandwritingDelegation = false;

            mHandled = false;

            mExceedHandwritingSlop = false;

        }

    }
@@ -1052,8 +1047,6 @@ public class HandwritingInitiator { 
                    // Fall back to the old delegation flow

                    mImm.prepareStylusHandwritingDelegation(mView, mDelegatePackageName);

                    mView.getHandwritingDelegatorCallback().run();

                    mState.mHasInitiatedHandwriting = false;

                    mState.mHasPreparedHandwritingDelegation = true;

                    break;

            }

        }

core/tests/coretests/src/android/view/stylus/HandwritingInitiatorTest.java

+20 −0
Original line number Diff line number Diff line
@@ -471,6 +471,26 @@ public class HandwritingInitiatorTest { 
        verify(mTestView1, times(1)).requestFocus();

    }



    @Test

    public void onTouchEvent_doesNothing_viewDisabled() {

        mTestView1.setEnabled(false);



        final int x1 = (sHwArea1.left + sHwArea1.right) / 2;

        final int y1 = (sHwArea1.top + sHwArea1.bottom) / 2;

        MotionEvent stylusEvent1 = createStylusEvent(ACTION_DOWN, x1, y1, 0);

        mHandwritingInitiator.onTouchEvent(stylusEvent1);



        final int x2 = x1 + mHandwritingSlop * 2;

        final int y2 = y1;



        MotionEvent stylusEvent2 = createStylusEvent(ACTION_MOVE, x2, y2, 0);

        mHandwritingInitiator.onTouchEvent(stylusEvent2);



        // HandwritingInitiator will not request focus if it is disabled.

        verify(mTestView1, never()).requestFocus();

        verify(mHandwritingInitiator, never()).startHandwriting(mTestView1);

    }



    @Test

    public void onTouchEvent_focusView_inputConnectionAlreadyBuilt_stylusMoveOnce_withinHWArea() {

        if (!mInitiateWithoutConnection) {