From cd2640bf30200d267b8e2ee8223c9d789c545ba9 Mon Sep 17 00:00:00 2001 From: Jerry Chang Date: Fri, 11 Dec 2020 13:49:51 +0800 Subject: [PATCH] Consider root task offset when updating split bounds Fix: 175360659 Test: manual verified on device with cutout Change-Id: I456b17ac74aa1894cb6d5c3ca4915f0313244b6e --- .../src/com/android/wm/shell/common/split/SplitLayout.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java index 4c70b5d32108e..e1a94b071bf4f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java @@ -123,14 +123,16 @@ public class SplitLayout { mBounds1.set(mRootBounds); mBounds2.set(mRootBounds); if (isLandscape(mRootBounds)) { + position += mRootBounds.left; mDividerBounds.left = position - mDividerInsets; mDividerBounds.right = mDividerBounds.left + mDividerWindowWidth; - mBounds1.right = mBounds1.left + position; + mBounds1.right = position; mBounds2.left = mBounds1.right + mDividerSize; } else { + position += mRootBounds.top; mDividerBounds.top = position - mDividerInsets; mDividerBounds.bottom = mDividerBounds.top + mDividerWindowWidth; - mBounds1.bottom = mBounds1.top + position; + mBounds1.bottom = position; mBounds2.top = mBounds1.bottom + mDividerSize; } }