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

Merge "Cancel recents animation when touch home key" into tm-dev

Browse Source
This commit is contained in:
Wei Sheng Shih
2022-03-04 08:40:42 +00:00
committed by Android (Google) Code Review
parent 9d093cad99 d275b6b520
commit a8b20748f3
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteTransitionCompat.java
View File

@@ -243,10 +243,15 @@ public class RemoteTransitionCompat implements Parcelable {
boolean merge(TransitionInfo info, SurfaceControl.Transaction t,
RecentsAnimationListener recents) {
ArrayList<TransitionInfo.Change> openingTasks = null;
boolean cancelRecents = false;
for (int i = info.getChanges().size() - 1; i >= 0; --i) {
final TransitionInfo.Change change = info.getChanges().get(i);
if (change.getMode() == TRANSIT_OPEN || change.getMode() == TRANSIT_TO_FRONT) {
if (change.getTaskInfo() != null) {
if (change.getTaskInfo().topActivityType == ACTIVITY_TYPE_HOME) {
// canceling recents animation
cancelRecents = true;
}
if (openingTasks == null) {
openingTasks = new ArrayList<>();
}
@@ -256,9 +261,11 @@ public class RemoteTransitionCompat implements Parcelable {
}
if (openingTasks == null) return false;
int pauseMatches = 0;
for (int i = 0; i < openingTasks.size(); ++i) {
if (mPausingTasks.contains(openingTasks.get(i).getContainer())) {
++pauseMatches;
if (!cancelRecents) {
for (int i = 0; i < openingTasks.size(); ++i) {
if (mPausingTasks.contains(openingTasks.get(i).getContainer())) {
++pauseMatches;
}
}
}
if (pauseMatches > 0) {