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

Merge "Add null check for testing if change is recent task" into udc-qpr-dev am: da53aded0f

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

Change-Id: Ic33e7ddce4ce15618bfc41b8da639a9a62693ada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Winson Chung
2023-07-06 20:50:26 +00:00
committed by Automerger Merge Worker
parent a3c8554c1f da53aded0f
commit f7c71b4c98
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -573,10 +573,12 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler {
} }
final boolean isRootTask = taskInfo != null final boolean isRootTask = taskInfo != null
&& TransitionInfo.isIndependent(change, info); && TransitionInfo.isIndependent(change, info);
final boolean isRecentsTask = mRecentsTask != null
&& mRecentsTask.equals(change.getContainer());
hasTaskChange = hasTaskChange || isRootTask; hasTaskChange = hasTaskChange || isRootTask;
final boolean isLeafTask = leafTaskFilter.test(change); final boolean isLeafTask = leafTaskFilter.test(change);
if (TransitionUtil.isOpeningType(change.getMode())) { if (TransitionUtil.isOpeningType(change.getMode())) {
if (mRecentsTask != null && mRecentsTask.equals(change.getContainer())) { if (isRecentsTask) {
recentsOpening = change; recentsOpening = change;
} else if (isRootTask || isLeafTask) { } else if (isRootTask || isLeafTask) {
if (isLeafTask && taskInfo.topActivityType == ACTIVITY_TYPE_HOME) { if (isLeafTask && taskInfo.topActivityType == ACTIVITY_TYPE_HOME) {
@@ -591,7 +593,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler {
openingTaskIsLeafs.add(isLeafTask ? 1 : 0); openingTaskIsLeafs.add(isLeafTask ? 1 : 0);
} }
} else if (TransitionUtil.isClosingType(change.getMode())) { } else if (TransitionUtil.isClosingType(change.getMode())) {
if (mRecentsTask != null && mRecentsTask.equals(change.getContainer())) { if (isRecentsTask) {
foundRecentsClosing = true; foundRecentsClosing = true;
} else if (isRootTask || isLeafTask) { } else if (isRootTask || isLeafTask) {
if (closingTasks == null) { if (closingTasks == null) {
@@ -612,7 +614,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler {
if (!TransitionUtil.isOrderOnly(change) && isLeafTask) { if (!TransitionUtil.isOrderOnly(change) && isLeafTask) {
hasChangingApp = true; hasChangingApp = true;
} else if (isLeafTask && taskInfo.topActivityType == ACTIVITY_TYPE_HOME } else if (isLeafTask && taskInfo.topActivityType == ACTIVITY_TYPE_HOME
&& !mRecentsTask.equals(change.getContainer())) { && !isRecentsTask ) {
// Unless it is a 3p launcher. This means that the 3p launcher was already // Unless it is a 3p launcher. This means that the 3p launcher was already
// visible (eg. the "pausing" task is translucent over the 3p launcher). // visible (eg. the "pausing" task is translucent over the 3p launcher).
// Treat it as if we are "re-opening" the 3p launcher. // Treat it as if we are "re-opening" the 3p launcher.