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

Merge "Only move Task to PiP if there is only one non-finishing activity" into tm-dev am: 99b30edb9e

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

Change-Id: Ic899b670dadc84bc14df76d5d50d8745b542e979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Li
2022-04-18 10:06:41 +00:00
committed by Automerger Merge Worker
parent 266744531a 99b30edb9e
commit a18388d5a7
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -2007,8 +2007,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
r.getDisplayContent().prepareAppTransition(TRANSIT_NONE); r.getDisplayContent().prepareAppTransition(TRANSIT_NONE);
final TaskFragment organizedTf = r.getOrganizedTaskFragment(); final TaskFragment organizedTf = r.getOrganizedTaskFragment();
// TODO: Does it make sense to only count non-finishing activities? final boolean singleActivity = task.getNonFinishingActivityCount() == 1;
final boolean singleActivity = task.getActivityCount() == 1;
final Task rootTask; final Task rootTask;
if (singleActivity) { if (singleActivity) {
rootTask = task; rootTask = task;

8
services/core/java/com/android/server/wm/Task.java
View File

@@ -1380,14 +1380,6 @@ class Task extends TaskFragment {
return getActivity(ActivityRecord::canBeTopRunning); return getActivity(ActivityRecord::canBeTopRunning);
} }
int getActivityCount() {
final int[] activityCount = new int[1];
forAllActivities(ar -> {
activityCount[0]++;
});
return activityCount[0];
}
/** /**
* Return true if any activities in this task belongs to input uid. * Return true if any activities in this task belongs to input uid.
*/ */