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

Commit 5ab40d3a authored by Taran Singh's avatar Taran Singh Committed by Android (Google) Code Review
Browse files

Merge "Remove usage of last toolType for new startInput" into main

parents eb135e29 5bcb1494

core/java/android/inputmethodservice/InputMethodService.java

+1 −8
Original line number Original line Diff line number Diff line
@@ -401,10 +401,7 @@ public class InputMethodService extends AbstractInputMethodService { 
    private long mStylusHwSessionsTimeout = STYLUS_HANDWRITING_IDLE_TIMEOUT_MS;

    private long mStylusHwSessionsTimeout = STYLUS_HANDWRITING_IDLE_TIMEOUT_MS;

    private Runnable mStylusWindowIdleTimeoutRunnable;

    private Runnable mStylusWindowIdleTimeoutRunnable;

    private long mStylusWindowIdleTimeoutForTest;

    private long mStylusWindowIdleTimeoutForTest;

    /**



     * Tracks last {@link MotionEvent#getToolType(int)} used for {@link MotionEvent#ACTION_DOWN}.

     **/

    private int mLastUsedToolType;

    /**

    /**

     * Tracks the ctrl+shift shortcut

     * Tracks the ctrl+shift shortcut

     **/

     **/
@@ -1368,7 +1365,6 @@ public class InputMethodService extends AbstractInputMethodService { 




    private void updateEditorToolTypeInternal(int toolType) {

    private void updateEditorToolTypeInternal(int toolType) {

        if (Flags.useHandwritingListenerForTooltype()) {

        if (Flags.useHandwritingListenerForTooltype()) {

            mLastUsedToolType = toolType;

            if (mInputEditorInfo != null) {

            if (mInputEditorInfo != null) {

                mInputEditorInfo.setInitialToolType(toolType);

                mInputEditorInfo.setInitialToolType(toolType);

            }

            }
@@ -3385,9 +3381,6 @@ public class InputMethodService extends AbstractInputMethodService { 
                null /* icProto */);

                null /* icProto */);

        mInputStarted = true;

        mInputStarted = true;

        mStartedInputConnection = ic;

        mStartedInputConnection = ic;

        if (Flags.useHandwritingListenerForTooltype()) {

            editorInfo.setInitialToolType(mLastUsedToolType);

        }

        mInputEditorInfo = editorInfo;

        mInputEditorInfo = editorInfo;

        initialize();

        initialize();

        mInlineSuggestionSessionController.notifyOnStartInput(

        mInlineSuggestionSessionController.notifyOnStartInput(