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

Merge "Clear the focused app after reset adjacent TaskFragments" into tm-qpr-dev am: 1b8d1f91be

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

Change-Id: I5e752da91cdfe3e78f2b087c088792645180d19b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Louis Chang
2022-11-17 01:41:14 +00:00
committed by Automerger Merge Worker
parent 92f82dc7b2 1b8d1f91be
commit 9cebef1b61
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1005,6 +1005,14 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
tf1.setAdjacentTaskFragment(tf2); tf1.setAdjacentTaskFragment(tf2);
effects |= TRANSACT_EFFECTS_LIFECYCLE; effects |= TRANSACT_EFFECTS_LIFECYCLE;
// Clear the focused app if the focused app is no longer visible after reset the
// adjacent TaskFragments.
if (tf2 == null && tf1.getDisplayContent().mFocusedApp != null
&& tf1.hasChild(tf1.getDisplayContent().mFocusedApp)
&& !tf1.shouldBeVisible(null /* starting */)) {
tf1.getDisplayContent().setFocusedApp(null);
}
final Bundle bundle = hop.getLaunchOptions(); final Bundle bundle = hop.getLaunchOptions();
final WindowContainerTransaction.TaskFragmentAdjacentParams adjacentParams = final WindowContainerTransaction.TaskFragmentAdjacentParams adjacentParams =
bundle != null ? new WindowContainerTransaction.TaskFragmentAdjacentParams( bundle != null ? new WindowContainerTransaction.TaskFragmentAdjacentParams(