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

Commit 437a855f authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix no response after entered split screen" into tm-qpr-dev am: d64db8b5 am: d2b00b70 

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



Change-Id: I38c2ec5fcc630847c8b9d270cac3fc2a5fac3447
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d22225ef d2b00b70

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

+9 −10
Original line number Diff line number Diff line
@@ -589,17 +589,17 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                    return;

                }



                // The surfaces of splitting tasks were placed with window bounds when preparing the

                // transition, so update divider surface separately.

                final RemoteAnimationTarget dividerTarget = getDividerBarLegacyTarget();

                mSplitLayout.getRefDividerBounds(mTempRect1);

                t.setLayer(dividerTarget.leash, Integer.MAX_VALUE)

                        .setPosition(dividerTarget.leash, mTempRect1.left, mTempRect1.top);

                setDividerVisibility(true, t);

                // Wrap the divider bar into non-apps target to animate together.

                nonApps = ArrayUtils.appendElement(RemoteAnimationTarget.class, nonApps,

                        getDividerBarLegacyTarget());



                updateSurfaceBounds(mSplitLayout, t, false);

                setDividerVisibility(true, t);

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

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

                        t.show(apps[i].leash);

                        // Reset the surface position of the opening app to prevent double-offset.

                        t.setPosition(apps[i].leash, 0, 0);

                    }

                }

                t.apply();
@@ -614,9 +614,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                        };

                Transitions.setRunningRemoteTransitionDelegate(adapter.getCallingApplication());

                try {

                    adapter.getRunner().onAnimationStart(transit, apps, wallpapers,

                            ArrayUtils.appendElement(RemoteAnimationTarget.class, nonApps,

                                    dividerTarget), wrapCallback);

                    adapter.getRunner().onAnimationStart(

                            transit, apps, wallpapers, nonApps, wrapCallback);

                } catch (RemoteException e) {

                    Slog.e(TAG, "Error starting remote animation", e);

                }