diff options
| author | 2022-09-12 15:00:15 +0000 | |
|---|---|---|
| committer | 2022-09-12 15:00:15 +0000 | |
| commit | de9d4b7d8e3d4fad768d0d8c44883ead50a046c4 (patch) | |
| tree | 35fd74c5c4df9bfc6a61792c05e306d84f6665bb | |
| parent | a4aa6f5e4719dc29220389e96769ad92e225011c (diff) | |
| parent | 4a1722411f989df0f0c9ab9808142670a478f692 (diff) | |
[RESTRICT AUTOMERGE]Animate back gesture with focusd window activity am: 4a1722411f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19891005
Change-Id: I76f181e00df04e9831b64a29d30f2373113a2af0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/BackNavigationController.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/wm/BackNavigationController.java b/services/core/java/com/android/server/wm/BackNavigationController.java index 35a39c048e57..028d4b3e0871 100644 --- a/services/core/java/com/android/server/wm/BackNavigationController.java +++ b/services/core/java/com/android/server/wm/BackNavigationController.java @@ -310,7 +310,7 @@ class BackNavigationController { mBackNaviAnimationController = new BackNaviAnimationController( backAnimationAdaptor.getRunner(), this, currentActivity.getDisplayId()); - prepareBackToHomeTransition(currentTask, prevTask); + prepareBackToHomeTransition(currentActivity, prevTask); infoBuilder.setPrepareAnimation(true); } } else { @@ -489,8 +489,8 @@ class BackNavigationController { mWindowManagerService = wm; } - private void prepareBackToHomeTransition(Task currentTask, Task homeTask) { - final DisplayContent dc = currentTask.getDisplayContent(); + private void prepareBackToHomeTransition(ActivityRecord currentActivity, Task homeTask) { + final DisplayContent dc = currentActivity.getDisplayContent(); final ActivityRecord homeActivity = homeTask.getTopNonFinishingActivity(); if (!homeActivity.mVisibleRequested) { homeActivity.setVisibility(true); @@ -499,7 +499,7 @@ class BackNavigationController { dc.ensureActivitiesVisible( null /* starting */, 0 /* configChanges */, false /* preserveWindows */, true); - mBackNaviAnimationController.initialize(homeActivity, currentTask.getTopMostActivity()); + mBackNaviAnimationController.initialize(homeActivity, currentActivity); } void finishAnimation() { |