Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 446ab1e6 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Clear the focused app after reset adjacent TaskFragments" into... 

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

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



Change-Id: Iab5a1725a7b63e0dfbd86b885cb7f2a9d3de74da
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5ac09e58 9cebef1b

services/core/java/com/android/server/wm/WindowOrganizerController.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -997,6 +997,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(