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

Commit ae52ccc4 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Fix issue with settings launch animation" into rvc-dev am: 36eb8c05 

Change-Id: I1cddd9c0d15ee30a3b8f548b73e15c1809f6fb45
parents 8b6ddea2 36eb8c05

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

+0 −4
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ class ActivityStarter { 


    // The task display area to launch the activity onto, barring any strong reason to do otherwise.

    private TaskDisplayArea mPreferredTaskDisplayArea;

    // The windowing mode to apply to the root task, if possible

    private int mPreferredWindowingMode;



    private Task mInTask;
@@ -1560,9 +1559,6 @@ class ActivityStarter { 
        if (!mAvoidMoveToFront && mDoResume) {

            mTargetStack.getStack().moveToFront("reuseOrNewTask", targetTask);

            if (mOptions != null) {

                if (mPreferredWindowingMode != WINDOWING_MODE_UNDEFINED) {

                    mTargetStack.setWindowingMode(mPreferredWindowingMode);

                }

                if (mOptions.getTaskAlwaysOnTop()) {

                    mTargetStack.setAlwaysOnTop(true);

                }