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

Commit 724c3547 authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

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

parents 8b299f42 2a1ef7a7

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