Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c65f1fa authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I48004e3e40bf196234adfdba1e77af3dfb8bc7ac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents adf6b818 8dc61b1e

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

+3 −1
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ public class RemoteTransitionCompat implements Parcelable { 
        private IBinder mTransition = null;

        private boolean mKeyguardLocked = false;

        private RemoteAnimationTargetCompat[] mAppearedTargets;

        private boolean mWillFinishToHome = false;



        void setup(RecentsAnimationControllerCompat wrapped, TransitionInfo info,

                IRemoteTransitionFinishedCallback finishCB,
@@ -392,7 +393,7 @@ public class RemoteTransitionCompat implements Parcelable { 
                if (toHome) wct.reorder(mRecentsTask, true /* toTop */);

                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

                // recents, so end the transition by moving the app back to the top (and also

                // re-showing it's task).
@@ -476,6 +477,7 @@ public class RemoteTransitionCompat implements Parcelable { 
        }



        @Override public void setWillFinishToHome(boolean willFinishToHome) {

            mWillFinishToHome = willFinishToHome;

            if (mWrapped != null) mWrapped.setWillFinishToHome(willFinishToHome);

        }