From 718e9a57a87ab7942288aa52fe82dfad694f538d Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Tue, 14 Apr 2020 15:53:40 -0700 Subject: Fix issue with settings launch animation - Remove call to override the windowing mode, it seems like we already create a new root task with the right windowing mode now Bug: 152439204 Test: Launch settings from quick settings over home, ensure that animation plays Change-Id: I48f747a7f4fdf664945b02d1fb3694ab454cf35e --- services/core/java/com/android/server/wm/ActivityStarter.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index 0754a348740b..8edc84fc8f37 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -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); } -- cgit v1.2.3-59-g8ed1b