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

Merge "Limit launching placeholder to top TaskFragment" into tm-dev

Browse Source
This commit is contained in:
Charles Chen
2022-03-03 02:44:54 +00:00
committed by Android (Google) Code Review
parent 6186949467 3d419be76f
commit b4620e2882
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java
View File

@@ -404,7 +404,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
TaskFragmentContainer getTopActiveContainer() { TaskFragmentContainer getTopActiveContainer() {
for (int i = mContainers.size() - 1; i >= 0; i--) { for (int i = mContainers.size() - 1; i >= 0; i--) {
TaskFragmentContainer container = mContainers.get(i); TaskFragmentContainer container = mContainers.get(i);
if (!container.isFinished() && container.getTopNonFinishingActivity() != null) { if (!container.isFinished() && container.getRunningActivityCount() > 0) {
return container; return container;
} }
} }
@@ -499,6 +499,10 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
boolean launchPlaceholderIfNecessary(@NonNull Activity activity) { boolean launchPlaceholderIfNecessary(@NonNull Activity activity) {
final TaskFragmentContainer container = getContainerWithActivity( final TaskFragmentContainer container = getContainerWithActivity(
activity.getActivityToken()); activity.getActivityToken());
// Don't launch placeholder if the container is occluded.
if (container != getTopActiveContainer()) {
return false;
}
SplitContainer splitContainer = container != null ? getActiveSplitForContainer(container) SplitContainer splitContainer = container != null ? getActiveSplitForContainer(container)
: null; : null;