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

Commit 40b92e65 authored by Ming-Shin Lu's avatar Ming-Shin Lu Committed by Automerger Merge Worker
Browse files

Merge "Fix IME screenshot position in 3-button landscape mode" into tm-dev am: eae7fba6 

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

Change-Id: Ic1187d06f444d78d0a50e2a2056c47b2395b9102
parents bf722d37 eae7fba6

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

+3 −3
Original line number Diff line number Diff line
@@ -4071,12 +4071,12 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
            t.setColorSpace(activity.mSurfaceControl, ColorSpace.get(ColorSpace.Named.SRGB));

            t.setLayer(imeSurface, 1);



            final Point surfacePosition = new Point(

                    imeWindow.getFrame().left - mImeTarget.getFrame().left,

                    imeWindow.getFrame().top - mImeTarget.getFrame().top);

            final Point surfacePosition = new Point(imeWindow.getFrame().left,

                    imeWindow.getFrame().top);

            if (imeParent == activity.getSurfaceControl()) {

                t.setPosition(imeSurface, surfacePosition.x, surfacePosition.y);

            } else {

                surfacePosition.offset(-mImeTarget.getFrame().left, -mImeTarget.getFrame().top);

                surfacePosition.offset(mImeTarget.mAttrs.surfaceInsets.left,

                        mImeTarget.mAttrs.surfaceInsets.top);

                t.setPosition(imeSurface, surfacePosition.x, surfacePosition.y);