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

Commit 690ef6a8 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Set the candidate task windowing mode" into tm-dev am: 8b830691 am: a113674c"

parents 1a80967f fd5d409f

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

+0 −5
Original line number Diff line number Diff line
@@ -2815,11 +2815,6 @@ class ActivityStarter { 
            }

        }



        if (mPreferredWindowingMode != WINDOWING_MODE_UNDEFINED

                && intentTask.getWindowingMode() != mPreferredWindowingMode) {

            intentTask.setWindowingMode(mPreferredWindowingMode);

        }



        // Update the target's launch cookie to those specified in the options if set

        if (mStartActivity.mLaunchCookie != null) {

            intentActivity.mLaunchCookie = mStartActivity.mLaunchCookie;

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

+5 −0
Original line number Diff line number Diff line
@@ -979,6 +979,11 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { 
                    candidateTask.reparent(this, onTop);

                }

            }

            // Update windowing mode if necessary, e.g. launch into a different windowing mode.

            if (windowingMode != WINDOWING_MODE_UNDEFINED && candidateTask.isRootTask()

                    && candidateTask.getWindowingMode() != windowingMode) {

                candidateTask.setWindowingMode(windowingMode);

            }

            return candidateTask.getRootTask();

        }

        return new Task.Builder(mAtmService)