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

Commit 8b830691 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Set the candidate task windowing mode" into tm-dev

parents a756b843 e714cb1a

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

+0 −5
Original line number Original line Diff line number Diff line
@@ -2809,11 +2809,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

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

        if (mStartActivity.mLaunchCookie != null) {

        if (mStartActivity.mLaunchCookie != null) {

            intentActivity.mLaunchCookie = mStartActivity.mLaunchCookie;

            intentActivity.mLaunchCookie = mStartActivity.mLaunchCookie;

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

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

                    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 candidateTask.getRootTask();

        }

        }

        return new Task.Builder(mAtmService)

        return new Task.Builder(mAtmService)