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

Commit 74380831 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix not hiding soft-input when quick switch start" into tm-qpr-dev am:... 

Merge "Fix not hiding soft-input when quick switch start" into tm-qpr-dev am: a4f1d064 am: a9202db0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19279736



Change-Id: Icd17cd88cb83d0be3f4b896f6c32eabf44c61446
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fc65499a a9202db0

services/core/java/com/android/server/wm/InputMonitor.java

+25 −2
Original line number Diff line number Diff line
@@ -63,7 +63,10 @@ import android.view.SurfaceControl; 
import android.view.WindowManager;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.inputmethod.SoftInputShowHideReason;

import com.android.internal.protolog.common.ProtoLog;

import com.android.server.LocalServices;

import com.android.server.inputmethod.InputMethodManagerInternal;



import java.io.PrintWriter;

import java.lang.ref.WeakReference;
@@ -403,8 +406,28 @@ final class InputMonitor { 
                    // Shell transitions doesn't use RecentsAnimationController

                    || getWeak(mActiveRecentsActivity) != null && focus.inTransition();

            if (shouldApplyRecentsInputConsumer) {

                if (mInputFocus != recentsAnimationInputConsumer.mWindowHandle.token) {

                    requestFocus(recentsAnimationInputConsumer.mWindowHandle.token,

                            recentsAnimationInputConsumer.mName);

                    // Hiding IME/IME icon when recents input consumer gain focus.

                    if (!mDisplayContent.isImeAttachedToApp()) {

                        // Hiding IME if IME window is not attached to app since it's not proper to

                        // snapshot Task with IME window to animate together in this case.

                        final InputMethodManagerInternal inputMethodManagerInternal =

                                LocalServices.getService(InputMethodManagerInternal.class);

                        if (inputMethodManagerInternal != null) {

                            inputMethodManagerInternal.hideCurrentInputMethod(

                                    SoftInputShowHideReason.HIDE_RECENTS_ANIMATION);

                        }

                    } else {

                        // Disable IME icon explicitly when IME attached to the app in case

                        // IME icon might flickering while swiping to the next app task still

                        // in animating before the next app window focused, or IME icon

                        // persists on the bottom when swiping the task to recents.

                        InputMethodManagerInternal.get().updateImeWindowStatus(

                                true /* disableImeIcon */);

                    }

                }

                return;

            }

        }

services/core/java/com/android/server/wm/RecentsAnimationController.java

+0 −21
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ import android.window.PictureInPictureSurfaceTransaction; 
import android.window.TaskSnapshot;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.inputmethod.SoftInputShowHideReason;

import com.android.internal.protolog.common.ProtoLog;

import com.android.internal.util.function.pooled.PooledConsumer;

import com.android.internal.util.function.pooled.PooledLambda;
@@ -326,26 +325,6 @@ public class RecentsAnimationController implements DeathRecipient { 
                        }

                    }

                    InputMethodManagerInternal.get().maybeFinishStylusHandwriting();

                    if (!behindSystemBars) {

                        // Hiding IME if IME window is not attached to app.

                        // Since some windowing mode is not proper to snapshot Task with IME window

                        // while the app transitioning to the next task (e.g. split-screen mode)

                        if (!mDisplayContent.isImeAttachedToApp()) {

                            final InputMethodManagerInternal inputMethodManagerInternal =

                                    LocalServices.getService(InputMethodManagerInternal.class);

                            if (inputMethodManagerInternal != null) {

                                inputMethodManagerInternal.hideCurrentInputMethod(

                                        SoftInputShowHideReason.HIDE_RECENTS_ANIMATION);

                            }

                        } else {

                            // Disable IME icon explicitly when IME attached to the app in case

                            // IME icon might flickering while swiping to the next app task still

                            // in animating before the next app window focused, or IME icon

                            // persists on the bottom when swiping the task to recents.

                            InputMethodManagerInternal.get().updateImeWindowStatus(

                                    true /* disableImeIcon */);

                        }

                    }

                    mService.mWindowPlacerLocked.requestTraversal();

                }

            } finally {

services/core/java/com/android/server/wm/Transition.java

+0 −22
Original line number Diff line number Diff line
@@ -85,11 +85,9 @@ import android.window.TransitionInfo; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.graphics.ColorUtils;

import com.android.internal.inputmethod.SoftInputShowHideReason;

import com.android.internal.protolog.ProtoLogGroup;

import com.android.internal.protolog.common.ProtoLog;

import com.android.internal.util.function.pooled.PooledLambda;

import com.android.server.LocalServices;

import com.android.server.inputmethod.InputMethodManagerInternal;



import java.lang.annotation.Retention;
@@ -959,26 +957,6 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
            }

        }



        // Hiding IME/IME icon when starting quick-step with resents animation.

        if (!mTargetDisplays.get(mRecentsDisplayId).isImeAttachedToApp()) {

            // Hiding IME if IME window is not attached to app.

            // Since some windowing mode is not proper to snapshot Task with IME window

            // while the app transitioning to the next task (e.g. split-screen mode)

            final InputMethodManagerInternal inputMethodManagerInternal =

                    LocalServices.getService(InputMethodManagerInternal.class);

            if (inputMethodManagerInternal != null) {

                inputMethodManagerInternal.hideCurrentInputMethod(

                        SoftInputShowHideReason.HIDE_RECENTS_ANIMATION);

            }

        } else {

            // Disable IME icon explicitly when IME attached to the app in case

            // IME icon might flickering while swiping to the next app task still

            // in animating before the next app window focused, or IME icon

            // persists on the bottom when swiping the task to recents.

            InputMethodManagerInternal.get().updateImeWindowStatus(

                    true /* disableImeIcon */);

        }



        // The rest of this function handles nav-bar reparenting



        if (!dc.getDisplayPolicy().shouldAttachNavBarToAppDuringTransition()