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

Commit 8ec93301 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31234200'] into 25Q1-release. 

Change-Id: I7eded9fcdc245174827adeeebcd4e8d57e0bee8c
parents 7b67cfb2 9c9a11f8

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

+3 −2
Original line number Diff line number Diff line
@@ -387,8 +387,9 @@ public final class ImeVisibilityStateComputer { 
    @GuardedBy("ImfLock.class")

    void setWindowState(IBinder windowToken, @NonNull ImeTargetWindowState newState) {

        final ImeTargetWindowState state = mRequestWindowStateMap.get(windowToken);

        if (state != null && newState.hasEditorFocused()

                && newState.mToolType != MotionEvent.TOOL_TYPE_STYLUS) {

        if (state != null && newState.hasEditorFocused() && (

                newState.mToolType != MotionEvent.TOOL_TYPE_STYLUS

                        || Flags.refactorInsetsController())) {

            // Inherit the last requested IME visible state when the target window is still

            // focused with an editor.

            newState.setRequestedImeVisible(state.mRequestedImeVisible);