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

Merge "When checking for isTaskView(), account for children."

Browse Source
This commit is contained in:
Gaurav Bhola
2023-01-23 16:59:48 +00:00
committed by Android (Google) Code Review
parent fc15fd318c d48c484623
commit 36fd4ec7cf
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/wm/AppTransitionController.java
View File

@@ -901,9 +901,18 @@ public class AppTransitionController {
* TODO(b/213312721): Remove this predicate and its callers once ShellTransition is enabled.
*/
static boolean isTaskViewTask(WindowContainer wc) {
// We use Task#mRemoveWithTaskOrganizer to identify an embedded Task, but this is a hack and
// Use Task#mRemoveWithTaskOrganizer to identify an embedded Task, but this is a hack and
// it is not guaranteed to work this logic in the future version.
return wc instanceof Task && ((Task) wc).mRemoveWithTaskOrganizer;
boolean isTaskViewTask = wc instanceof Task && ((Task) wc).mRemoveWithTaskOrganizer;
if (isTaskViewTask) {
return true;
}
WindowContainer parent = wc.getParent();
boolean isParentATaskViewTask = parent != null
&& parent instanceof Task
&& ((Task) parent).mRemoveWithTaskOrganizer;
return isParentATaskViewTask;
}
/**