Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix wrong split bounds if IME shown then rotate" into tm-qpr-dev am: a2e9ded317

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

Change-Id: If92f7548883b09f5bd6754d47fc77e0b59e9ce97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tony Huang
2022-07-21 07:25:12 +00:00
committed by Automerger Merge Worker
parent e11fa10307 a2e9ded317
commit c12c538b32
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java
View File

@@ -727,31 +727,23 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
ActivityManager.RunningTaskInfo taskInfo1, ActivityManager.RunningTaskInfo taskInfo2) { ActivityManager.RunningTaskInfo taskInfo1, ActivityManager.RunningTaskInfo taskInfo2) {
if (offsetX == 0 && offsetY == 0) { if (offsetX == 0 && offsetY == 0) {
wct.setBounds(taskInfo1.token, mBounds1); wct.setBounds(taskInfo1.token, mBounds1);
wct.setAppBounds(taskInfo1.token, null);
wct.setScreenSizeDp(taskInfo1.token, wct.setScreenSizeDp(taskInfo1.token,
SCREEN_WIDTH_DP_UNDEFINED, SCREEN_HEIGHT_DP_UNDEFINED); SCREEN_WIDTH_DP_UNDEFINED, SCREEN_HEIGHT_DP_UNDEFINED);
wct.setBounds(taskInfo2.token, mBounds2); wct.setBounds(taskInfo2.token, mBounds2);
wct.setAppBounds(taskInfo2.token, null);
wct.setScreenSizeDp(taskInfo2.token, wct.setScreenSizeDp(taskInfo2.token,
SCREEN_WIDTH_DP_UNDEFINED, SCREEN_HEIGHT_DP_UNDEFINED); SCREEN_WIDTH_DP_UNDEFINED, SCREEN_HEIGHT_DP_UNDEFINED);
} else { } else {
mTempRect.set(taskInfo1.configuration.windowConfiguration.getBounds()); getBounds1(mTempRect);
mTempRect.offset(offsetX, offsetY); mTempRect.offset(offsetX, offsetY);
wct.setBounds(taskInfo1.token, mTempRect); wct.setBounds(taskInfo1.token, mTempRect);
mTempRect.set(taskInfo1.configuration.windowConfiguration.getAppBounds());
mTempRect.offset(offsetX, offsetY);
wct.setAppBounds(taskInfo1.token, mTempRect);
wct.setScreenSizeDp(taskInfo1.token, wct.setScreenSizeDp(taskInfo1.token,
taskInfo1.configuration.screenWidthDp, taskInfo1.configuration.screenWidthDp,
taskInfo1.configuration.screenHeightDp); taskInfo1.configuration.screenHeightDp);
mTempRect.set(taskInfo2.configuration.windowConfiguration.getBounds()); getBounds2(mTempRect);
mTempRect.offset(offsetX, offsetY); mTempRect.offset(offsetX, offsetY);
wct.setBounds(taskInfo2.token, mTempRect); wct.setBounds(taskInfo2.token, mTempRect);
mTempRect.set(taskInfo2.configuration.windowConfiguration.getAppBounds());
mTempRect.offset(offsetX, offsetY);
wct.setAppBounds(taskInfo2.token, mTempRect);
wct.setScreenSizeDp(taskInfo2.token, wct.setScreenSizeDp(taskInfo2.token,
taskInfo2.configuration.screenWidthDp, taskInfo2.configuration.screenWidthDp,
taskInfo2.configuration.screenHeightDp); taskInfo2.configuration.screenHeightDp);