From 0ede1eadb77f469a7fd7843fcca45c3c144cc004 Mon Sep 17 00:00:00 2001
From: mincheli <mincheli@google.com>
Date: Fri, 10 Jul 2020 14:43:48 +0800
Subject: [PATCH] Offsets the position of window maganification by the margin

When window magnification is toggled on, the position of window
magnification is not aligned with the one after updating its
layout params. And this bug looks like a transition animation that
is unexpected.
To fix it, we have to offset the position by the margin first
when adding window magnification layout before updating its
layout params.

Bug: 160939052
Test: none
Change-Id: I8e83094d39f33b670e160aaf11c3d09d60dc77bf
---
 .../systemui/accessibility/WindowMagnificationController.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java
index 7e9faff8c2964..8b6581ff18567 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java
@@ -258,8 +258,8 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold
                         | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
                 PixelFormat.TRANSPARENT);
         params.gravity = Gravity.TOP | Gravity.LEFT;
-        params.x = mMagnificationFrame.left;
-        params.y = mMagnificationFrame.top;
+        params.x = mMagnificationFrame.left - mMirrorSurfaceMargin;
+        params.y = mMagnificationFrame.top - mMirrorSurfaceMargin;
         params.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
         params.setTitle(mContext.getString(R.string.magnification_window_title));