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

Merge "Avoid re-launch button show after split switching" into tm-qpr-dev am: 2b9d5ac7cc

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

Change-Id: I02f267a7fffbe44d38645425ed1575430af0aa3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tony Huang
2022-07-11 04:23:25 +00:00
committed by Automerger Merge Worker
parent f1f5b0174f 2b9d5ac7cc
commit 1b8383ca2b
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -487,13 +487,25 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
private DividerSnapAlgorithm getSnapAlgorithm(Context context, Rect rootBounds,
@Nullable Rect stableInsets) {
final boolean isLandscape = isLandscape(rootBounds);
final Rect insets = stableInsets != null ? stableInsets : getDisplayInsets(context);
// Make split axis insets value same as the larger one to avoid bounds1 and bounds2
// have difference after split switching for solving issues on non-resizable app case.
if (isLandscape) {
final int largerInsets = Math.max(insets.left, insets.right);
insets.set(largerInsets, insets.top, largerInsets, insets.bottom);
} else {
final int largerInsets = Math.max(insets.top, insets.bottom);
insets.set(insets.left, largerInsets, insets.right, largerInsets);
}
return new DividerSnapAlgorithm(
context.getResources(),
rootBounds.width(),
rootBounds.height(),
mDividerSize,
!isLandscape,
stableInsets != null ? stableInsets : getDisplayInsets(context),
insets,
isLandscape ? DOCKED_LEFT : DOCKED_TOP /* dockSide */);
}