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

Merge "Fix issues starting recents animation when starting a new activity" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-17 00:40:49 +00:00
committed by Android (Google) Code Review
parent 10f8ed0cf8 ba40d3a107
commit bd46f3f9d1
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/ActivityStarter.java
View File

@@ -1587,6 +1587,7 @@ class ActivityStarter {
} }
} }
} else if (mOptions.getAvoidMoveToFront()) { } else if (mOptions.getAvoidMoveToFront()) {
mDoResume = false;
mAvoidMoveToFront = true; mAvoidMoveToFront = true;
} }
} }
@@ -1929,7 +1930,7 @@ class ActivityStarter {
// Need to update mTargetStack because if task was moved out of it, the original stack may // Need to update mTargetStack because if task was moved out of it, the original stack may
// be destroyed. // be destroyed.
mTargetStack = intentActivity.getStack(); mTargetStack = intentActivity.getStack();
if (!mAvoidMoveToFront && !mMovedToFront && mDoResume) { if (!mMovedToFront && mDoResume) {
if (DEBUG_TASKS) Slog.d(TAG_TASKS, "Bring to front target: " + mTargetStack if (DEBUG_TASKS) Slog.d(TAG_TASKS, "Bring to front target: " + mTargetStack
+ " from " + intentActivity); + " from " + intentActivity);
mTargetStack.moveToFront("intentActivityFound"); mTargetStack.moveToFront("intentActivityFound");

1
services/core/java/com/android/server/am/RecentsAnimation.java
View File

@@ -169,6 +169,7 @@ class RecentsAnimation implements RecentsAnimationCallbacks,
.setMayWait(mUserController.getCurrentUserId()) .setMayWait(mUserController.getCurrentUserId())
.execute(); .execute();
mWindowManager.prepareAppTransition(TRANSIT_NONE, false); mWindowManager.prepareAppTransition(TRANSIT_NONE, false);
mWindowManager.executeAppTransition();
targetActivity = mDefaultDisplay.getStack(WINDOWING_MODE_UNDEFINED, targetActivity = mDefaultDisplay.getStack(WINDOWING_MODE_UNDEFINED,
mTargetActivityType).getTopActivity(); mTargetActivityType).getTopActivity();