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

Merge "Fix wrong layout after quick switch back to a split pair" into tm-qpr-dev am: 591c5ebf87

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

Change-Id: I2c1060cedd0bd7e575a2302badcde58a722e6ea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jerry Chang
2022-09-08 00:03:05 +00:00
committed by Automerger Merge Worker
parent c0f8cca34a 591c5ebf87
commit 6556eef7d8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
View File

@@ -579,8 +579,10 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
IRemoteAnimationFinishedCallback finishedCallback, IRemoteAnimationFinishedCallback finishedCallback,
SurfaceControl.Transaction t) { SurfaceControl.Transaction t) {
if (apps == null || apps.length == 0) { if (apps == null || apps.length == 0) {
onRemoteAnimationFinished(apps); updateSurfaceBounds(mSplitLayout, t, false /* applyResizingOffset */);
setDividerVisibility(true, t);
t.apply(); t.apply();
onRemoteAnimationFinished(apps);
try { try {
adapter.getRunner().onAnimationCancelled(mKeyguardShowing); adapter.getRunner().onAnimationCancelled(mKeyguardShowing);
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -593,7 +595,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
nonApps = ArrayUtils.appendElement(RemoteAnimationTarget.class, nonApps, nonApps = ArrayUtils.appendElement(RemoteAnimationTarget.class, nonApps,
getDividerBarLegacyTarget()); getDividerBarLegacyTarget());
updateSurfaceBounds(mSplitLayout, t, false); updateSurfaceBounds(mSplitLayout, t, false /* applyResizingOffset */);
setDividerVisibility(true, t); setDividerVisibility(true, t);
for (int i = 0; i < apps.length; ++i) { for (int i = 0; i < apps.length; ++i) {
if (apps[i].mode == MODE_OPENING) { if (apps[i].mode == MODE_OPENING) {