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

Commit ca575350 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Resume appSwitchesAllowed after exit PiP" into sc-v2-dev am: 1ba4fcf0 

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

Change-Id: Iaf34303cb7d368d58a2feb730b2bf64220078e01
parents 51d48836 1ba4fcf0

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

+14 −8
Original line number Diff line number Diff line
@@ -4584,14 +4584,15 @@ class Task extends TaskFragment { 
            }

            super.setWindowingMode(windowingMode);



            // Try reparent pinned activity back to its original task after onConfigurationChanged

            // cascade finishes. This is done on Task level instead of

            // {@link ActivityRecord#onConfigurationChanged(Configuration)} since when we exit PiP,

            // we set final windowing mode on the ActivityRecord first and then on its Task when

            // the exit PiP transition finishes. Meanwhile, the exit transition is always

            // performed on its original task, reparent immediately in ActivityRecord breaks it.

            if (currentMode == WINDOWING_MODE_PINNED) {

                if (topActivity != null && topActivity.getLastParentBeforePip() != null) {

            if (currentMode == WINDOWING_MODE_PINNED && topActivity != null) {

                // Try reparent pinned activity back to its original task after

                // onConfigurationChanged cascade finishes. This is done on Task level instead of

                // {@link ActivityRecord#onConfigurationChanged(Configuration)} since when we exit

                // PiP, we set final windowing mode on the ActivityRecord first and then on its

                // Task when the exit PiP transition finishes. Meanwhile, the exit transition is

                // always performed on its original task, reparent immediately in ActivityRecord

                // breaks it.

                if (topActivity.getLastParentBeforePip() != null) {

                    // Do not reparent if the pinned task is in removal, indicated by the

                    // force hidden flag.

                    if (!isForceHidden()) {
@@ -4604,6 +4605,11 @@ class Task extends TaskFragment { 
                        }

                    }

                }

                // Resume app-switches-allowed flag when exiting from pinned mode since

                // it does not follow the ActivityStarter path.

                if (topActivity.shouldBeVisible()) {

                    mAtmService.resumeAppSwitches();

                }

            }



            if (creating) {