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

"Merge" activity-only transitions into ongoing recents

Browse Source 
Since activity-only transitions don't impact recents
state, we can just apply them directly without interrupting
the current recents animation.

Bug: 269691226
Test: launch an app which launches an activity (into itself)
      after a delay (eg. notification permissions). Enter
      recents before that happens.
Change-Id: I356bcc93b975f9979f8ff6cda3c190c2e9ad3a3f
This commit is contained in:
Evan Rosky
2023-03-21 16:34:07 -07:00
parent c9fd9d3769
commit 20244f03e6
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java
View File

@@ -414,9 +414,11 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler {
boolean hasChangingApp = false;
final TransitionUtil.LeafTaskFilter leafTaskFilter =
new TransitionUtil.LeafTaskFilter();
boolean hasTaskChange = false;
for (int i = 0; i < info.getChanges().size(); ++i) {
final TransitionInfo.Change change = info.getChanges().get(i);
final ActivityManager.RunningTaskInfo taskInfo = change.getTaskInfo();
hasTaskChange = hasTaskChange || taskInfo != null;
final boolean isLeafTask = leafTaskFilter.test(change);
if (TransitionUtil.isOpeningType(change.getMode())) {
if (mRecentsTask != null && mRecentsTask.equals(change.getContainer())) {
@@ -520,7 +522,12 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler {
didMergeThings = true;
mState = STATE_NEW_TASK;
}
if (!didMergeThings) {
if (!hasTaskChange) {
// Activity only transition, so consume the merge as it doesn't affect the rest of
// recents.
Slog.d(TAG, "Got an activity only transition during recents, so apply directly");
mergeActivityOnly(info, t);
} else if (!didMergeThings) {
// Didn't recognize anything in incoming transition so don't merge it.
Slog.w(TAG, "Don't know how to merge this transition.");
return;
@@ -538,6 +545,19 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler {
}
}
/** For now, just set-up a jump-cut to the new activity. */
private void mergeActivityOnly(TransitionInfo info, SurfaceControl.Transaction t) {
for (int i = 0; i < info.getChanges().size(); ++i) {
final TransitionInfo.Change change = info.getChanges().get(i);
if (TransitionUtil.isOpeningType(change.getMode())) {
t.show(change.getLeash());
t.setAlpha(change.getLeash(), 1.f);
} else if (TransitionUtil.isClosingType(change.getMode())) {
t.hide(change.getLeash());
}
}
}
@Override
public TaskSnapshot screenshotTask(int taskId) {
try {