Merge "Fixing hide IME from a11y voice typing" into main (b19b0890) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+18 −5

Original line number	Diff line number	Diff line
		@@ -649,13 +649,26 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		visibilityStateComputer.getImePolicy().setA11yRequestNoSoftKeyboard(
		accessibilitySoftKeyboardSetting);
		if (visibilityStateComputer.getImePolicy().isA11yRequestNoSoftKeyboard()) {
		if (Flags.refactorInsetsController()) {
		final var statsToken = createStatsTokenForFocusedClient(false /* show */,
		SoftInputShowHideReason.HIDE_SETTINGS_ON_CHANGE, userId);
		setImeVisibilityOnFocusedWindowClient(false, userData, statsToken);
		} else {
		hideCurrentInputLocked(userData.mImeBindingState.mFocusedWindow,
		0 /* flags */, SoftInputShowHideReason.HIDE_SETTINGS_ON_CHANGE, userId);
		0 /* flags */, SoftInputShowHideReason.HIDE_SETTINGS_ON_CHANGE,
		userId);
		}
		} else if (isShowRequestedForCurrentWindow(userId)) {
		if (Flags.refactorInsetsController()) {
		final var statsToken = createStatsTokenForFocusedClient(true /* show */,
		SoftInputShowHideReason.SHOW_SETTINGS_ON_CHANGE, userId);
		setImeVisibilityOnFocusedWindowClient(true, userData, statsToken);
		} else {
		showCurrentInputLocked(userData.mImeBindingState.mFocusedWindow,
		InputMethodManager.SHOW_IMPLICIT,
		SoftInputShowHideReason.SHOW_SETTINGS_ON_CHANGE, userId);
		}
		}
		break;
		}
		case Settings.Secure.STYLUS_HANDWRITING_ENABLED: {