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

Commit 2673d4ed authored by Rob Carr's avatar Rob Carr Committed by Automerger Merge Worker
Browse files

Merge "DisplayContent: Don't force-update parent if layering didn't change"... 

Merge "DisplayContent: Don't force-update parent if layering didn't change" into tm-dev am: 724c3547

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



Change-Id: Ib26431b20a2bc860c2b18f224f1e38e3e1b83a3b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 30559919 724c3547

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

+2 −1
Original line number Diff line number Diff line
@@ -3978,6 +3978,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        }



        ProtoLog.i(WM_DEBUG_IME, "setInputMethodTarget %s", target);

        final boolean layeringTargetChanged = target != mImeLayeringTarget;

        mImeLayeringTarget = target;



        // 1. Reparent the IME container window to the target root DA to get the correct bounds and
@@ -4005,7 +4006,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        // 4. Update the IME control target to apply any inset change and animation.

        // 5. Reparent the IME container surface to either the input target app, or the IME window

        // parent.

        updateImeControlTarget(true /* forceUpdateImeParent */);

        updateImeControlTarget(layeringTargetChanged);

    }



    @VisibleForTesting