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

Browse Source
This commit is contained in:
Jerry Chang
2022-09-07 23:53:38 +00:00
committed by Android (Google) Code Review
parent ef1b7d635d e32c8fb9c2
commit 591c5ebf87
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) {