Merge "Register IME back callback on new dispatcher" into main (69cf329c) · Commits · e / os / android_frameworks_base

core/java/android/inputmethodservice/InputMethodService.java

+8 −6

Original line number	Diff line number	Diff line
		@@ -838,8 +838,14 @@ public class InputMethodService extends AbstractInputMethodService {
		// {@link #restartInput(InputConnection, EditorInfo)}.
		mImeDispatcher = params.imeDispatcher;
		if (mWindow != null) {
		mWindow.getOnBackInvokedDispatcher().setImeOnBackInvokedDispatcher(
		params.imeDispatcher);
		mWindow.getOnBackInvokedDispatcher().setImeOnBackInvokedDispatcher(mImeDispatcher);
		if (mDecorViewVisible && mShowInputRequested) {
		// Back callback is typically registered in {@link #showWindow()}, but it's
		// possible for {@link #doStartInput()} to be called without
		// {@link #showWindow()} so we also register here, after setting the new
		// dispatcher.
		registerDefaultOnBackInvokedCallback();
		}
		}
		}

		@@ -3405,10 +3411,6 @@ public class InputMethodService extends AbstractInputMethodService {
		mInlineSuggestionSessionController.notifyOnStartInputView();
		onStartInputView(mInputEditorInfo, restarting);
		startExtractingText(true);
		// Back callback is typically registered in {@link #showWindow()}, but it's possible
		// for {@link #doStartInput()} to be called without {@link #showWindow()} so we also
		// register here.
		registerDefaultOnBackInvokedCallback();
		} else if (mCandidatesVisibility == View.VISIBLE) {
		if (DEBUG) Log.v(TAG, "CALL: onStartCandidatesView");
		mCandidatesViewStarted = true;