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

Commit 71712718 authored by Jon Miranda's avatar Jon Miranda
Browse files

Fix bug where launcher closing animation isn't run. 

In some cases, we prematurely clear the force invisible flag before composing
the launcher animation, causing us to skip the animation.

Bug: 77205145
Change-Id: I4224741649a4fef34e255abac7b66bcf919c042f
parent 76a2a6ae

quickstep/src/com/android/quickstep/views/RecentsView.java

+13 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.quickstep.views;



import static com.android.launcher3.BaseActivity.INVISIBLE_BY_STATE_HANDLER;

import static com.android.launcher3.anim.Interpolators.ACCEL;

import static com.android.launcher3.anim.Interpolators.ACCEL_2;

import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
@@ -153,6 +154,15 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
        }

    };



    private TaskStackChangeListener mTaskStackClearFlagListener = new TaskStackChangeListener() {

        @Override

        public void onPinnedStackAnimationStarted() {

            // Needed for activities that auto-enter PiP, which will not trigger a remote

            // animation to be created

            mActivity.clearForceInvisibleFlag(INVISIBLE_BY_STATE_HANDLER);

        }

    };



    private int mLoadPlanId = -1;



    // Only valid until the launcher state changes to NORMAL
@@ -250,6 +260,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
        super.onAttachedToWindow();

        updateTaskStackListenerState();

        mActivity.addMultiWindowModeChangedListener(mMultiWindowModeChangedListener);

        ActivityManagerWrapper.getInstance().registerTaskStackListener(mTaskStackClearFlagListener);

    }



    @Override
@@ -257,6 +268,8 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
        super.onDetachedFromWindow();

        updateTaskStackListenerState();

        mActivity.removeMultiWindowModeChangedListener(mMultiWindowModeChangedListener);

        ActivityManagerWrapper.getInstance().unregisterTaskStackListener(

                mTaskStackClearFlagListener);

    }



    @Override

src/com/android/launcher3/BaseActivity.java

+0 −9
Original line number Diff line number Diff line
@@ -142,15 +142,6 @@ public abstract class BaseActivity extends Activity { 
        }

    }



    @Override

    public void onEnterAnimationComplete() {

        super.onEnterAnimationComplete();



        // Needed for activities that auto-enter PiP, which will not trigger a remote animation to

        // be created

        clearForceInvisibleFlag(INVISIBLE_BY_STATE_HANDLER);

    }



    @Override

    protected void onStop() {

        mActivityFlags &= ~ACTIVITY_STATE_STARTED & ~ACTIVITY_STATE_USER_ACTIVE;