Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue with settings launch animation" into rvc-dev am: 36eb8c05dc am: ae52ccc476 am: 24b5d60792

Browse Source 
Change-Id: I6a2eef3ff1597b36519b27e1379611f99ddd5dce
This commit is contained in:
Winson Chung
2020-04-22 05:50:57 +00:00
committed by Automerger Merge Worker
parent ad89080ba2 24b5d60792
commit 8a75387ac9
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -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);
}