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

Reduce flicker when split pair switching

Browse Source 
Checked this issue by winscope and found home task leash under
RecentsAnimationSplitTasks will become off screen bewteen the
transition, it lead to task thumbnail invisible and wallpaper show
then cause flicker.

Home suface going to off screen is caused by we will remove previous
RecentsAnimationSplitTasks when re-create it whether going to recents
or starting split.

Fix this by seperate mSplitTasksContainerLayer to two differents
surface for going to recents and starting split cases.

Fix: 246664520
Test: manual
Test: pass existing tests
Change-Id: I492cc8b82a15cc5abec06118b54232b355e880a0
This commit is contained in:
Tony Huang
2022-09-15 18:31:11 +08:00
parent e56320b84b
commit 15bbf37379
1 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java
View File

@@ -154,7 +154,8 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
private StageCoordinator mStageCoordinator;
// Only used for the legacy recents animation from splitscreen to allow the tasks to be animated
// outside the bounds of the roots by being reparented into a higher level fullscreen container
private SurfaceControl mSplitTasksContainerLayer;
private SurfaceControl mGoingToRecentsTasksLayer;
private SurfaceControl mStartingSplitTasksLayer;
public SplitScreenController(Context context,
ShellInit shellInit,
@@ -489,19 +490,53 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
}
RemoteAnimationTarget[] onGoingToRecentsLegacy(RemoteAnimationTarget[] apps) {
if (ENABLE_SHELL_TRANSITIONS) return null;
if (isSplitScreenVisible()) {
// Evict child tasks except the top visible one under split root to ensure it could be
// launched as full screen when switching to it on recents.
final WindowContainerTransaction wct = new WindowContainerTransaction();
mStageCoordinator.prepareEvictInvisibleChildTasks(wct);
mSyncQueue.queue(wct);
} else {
return null;
}
return reparentSplitTasksForAnimation(apps, false /* enterSplitScreen */);
SurfaceControl.Transaction t = mTransactionPool.acquire();
if (mGoingToRecentsTasksLayer != null) {
t.remove(mGoingToRecentsTasksLayer);
}
mGoingToRecentsTasksLayer = reparentSplitTasksForAnimation(apps, t,
"SplitScreenController#onGoingToRecentsLegacy" /* callsite */);
t.apply();
mTransactionPool.release(t);
return new RemoteAnimationTarget[]{mStageCoordinator.getDividerBarLegacyTarget()};
}
RemoteAnimationTarget[] onStartingSplitLegacy(RemoteAnimationTarget[] apps) {
if (ENABLE_SHELL_TRANSITIONS) return null;
int openingApps = 0;
for (int i = 0; i < apps.length; ++i) {
if (apps[i].mode == MODE_OPENING) openingApps++;
}
if (openingApps < 2) {
// Not having enough apps to enter split screen
return null;
}
SurfaceControl.Transaction t = mTransactionPool.acquire();
if (mStartingSplitTasksLayer != null) {
t.remove(mStartingSplitTasksLayer);
}
mStartingSplitTasksLayer = reparentSplitTasksForAnimation(apps, t,
"SplitScreenController#onStartingSplitLegacy" /* callsite */);
t.apply();
mTransactionPool.release(t);
try {
return reparentSplitTasksForAnimation(apps, true /* enterSplitScreen */);
return new RemoteAnimationTarget[]{mStageCoordinator.getDividerBarLegacyTarget()};
} finally {
for (RemoteAnimationTarget appTarget : apps) {
if (appTarget.leash != null) {
@@ -511,45 +546,23 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
}
}
private RemoteAnimationTarget[] reparentSplitTasksForAnimation(RemoteAnimationTarget[] apps,
boolean enterSplitScreen) {
if (ENABLE_SHELL_TRANSITIONS) return null;
if (enterSplitScreen) {
int openingApps = 0;
for (int i = 0; i < apps.length; ++i) {
if (apps[i].mode == MODE_OPENING) openingApps++;
}
if (openingApps < 2) {
// Not having enough apps to enter split screen
return null;
}
} else if (!isSplitScreenVisible()) {
return null;
}
final SurfaceControl.Transaction transaction = mTransactionPool.acquire();
if (mSplitTasksContainerLayer != null) {
// Remove the previous layer before recreating
transaction.remove(mSplitTasksContainerLayer);
}
private SurfaceControl reparentSplitTasksForAnimation(RemoteAnimationTarget[] apps,
SurfaceControl.Transaction t, String callsite) {
final SurfaceControl.Builder builder = new SurfaceControl.Builder(new SurfaceSession())
.setContainerLayer()
.setName("RecentsAnimationSplitTasks")
.setHidden(false)
.setCallsite("SplitScreenController#onGoingtoRecentsLegacy");
.setCallsite(callsite);
mRootTDAOrganizer.attachToDisplayArea(DEFAULT_DISPLAY, builder);
mSplitTasksContainerLayer = builder.build();
final SurfaceControl splitTasksLayer = builder.build();
for (int i = 0; i < apps.length; ++i) {
final RemoteAnimationTarget appTarget = apps[i];
transaction.reparent(appTarget.leash, mSplitTasksContainerLayer);
transaction.setPosition(appTarget.leash, appTarget.screenSpaceBounds.left,
t.reparent(appTarget.leash, splitTasksLayer);
t.setPosition(appTarget.leash, appTarget.screenSpaceBounds.left,
appTarget.screenSpaceBounds.top);
}
transaction.apply();
mTransactionPool.release(transaction);
return new RemoteAnimationTarget[]{mStageCoordinator.getDividerBarLegacyTarget()};
return splitTasksLayer;
}
/**
* Sets drag info to be logged when splitscreen is entered.