Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6556eef7 authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I2c1060cedd0bd7e575a2302badcde58a722e6ea0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0f8cca3 591c5ebf

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

+4 −2
Original line number Diff line number Diff line
@@ -579,8 +579,10 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                    IRemoteAnimationFinishedCallback finishedCallback,

                    SurfaceControl.Transaction t) {

                if (apps == null || apps.length == 0) {

                    onRemoteAnimationFinished(apps);

                    updateSurfaceBounds(mSplitLayout, t, false /* applyResizingOffset */);

                    setDividerVisibility(true, t);

                    t.apply();

                    onRemoteAnimationFinished(apps);

                    try {

                        adapter.getRunner().onAnimationCancelled(mKeyguardShowing);

                    } catch (RemoteException e) {
@@ -593,7 +595,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                nonApps = ArrayUtils.appendElement(RemoteAnimationTarget.class, nonApps,

                        getDividerBarLegacyTarget());



                updateSurfaceBounds(mSplitLayout, t, false);

                updateSurfaceBounds(mSplitLayout, t, false /* applyResizingOffset */);

                setDividerVisibility(true, t);

                for (int i = 0; i < apps.length; ++i) {

                    if (apps[i].mode == MODE_OPENING) {