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

Merge "Hook up setWillFinishToHome in recents wrapper" into tm-qpr-dev am: 8dc61b1ee2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19489031

Change-Id: I48004e3e40bf196234adfdba1e77af3dfb8bc7ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Evan Rosky
2022-08-02 20:38:46 +00:00
committed by Automerger Merge Worker
parent adf6b8183a 8dc61b1ee2
commit 7c65f1fa6a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteTransitionCompat.java
View File

@@ -230,6 +230,7 @@ public class RemoteTransitionCompat implements Parcelable {
private IBinder mTransition = null; private IBinder mTransition = null;
private boolean mKeyguardLocked = false; private boolean mKeyguardLocked = false;
private RemoteAnimationTargetCompat[] mAppearedTargets; private RemoteAnimationTargetCompat[] mAppearedTargets;
private boolean mWillFinishToHome = false;
void setup(RecentsAnimationControllerCompat wrapped, TransitionInfo info, void setup(RecentsAnimationControllerCompat wrapped, TransitionInfo info,
IRemoteTransitionFinishedCallback finishCB, IRemoteTransitionFinishedCallback finishCB,
@@ -392,7 +393,7 @@ public class RemoteTransitionCompat implements Parcelable {
if (toHome) wct.reorder(mRecentsTask, true /* toTop */); if (toHome) wct.reorder(mRecentsTask, true /* toTop */);
else wct.restoreTransientOrder(mRecentsTask); else wct.restoreTransientOrder(mRecentsTask);
} }
if (!toHome && mPausingTasks != null && mOpeningLeashes == null) { if (!toHome && !mWillFinishToHome && mPausingTasks != null && mOpeningLeashes == null) {
// The gesture went back to opening the app rather than continuing with // The gesture went back to opening the app rather than continuing with
// recents, so end the transition by moving the app back to the top (and also // recents, so end the transition by moving the app back to the top (and also
// re-showing it's task). // re-showing it's task).
@@ -476,6 +477,7 @@ public class RemoteTransitionCompat implements Parcelable {
} }
@Override public void setWillFinishToHome(boolean willFinishToHome) { @Override public void setWillFinishToHome(boolean willFinishToHome) {
mWillFinishToHome = willFinishToHome;
if (mWrapped != null) mWrapped.setWillFinishToHome(willFinishToHome); if (mWrapped != null) mWrapped.setWillFinishToHome(willFinishToHome);
} }