Merge "Fix IME screenshot position in 3-button landscape mode" into tm-dev (eae7fba6) · Commits · e / os / android_frameworks_base

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);