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

Commit 5dc6060c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixing activity referred after destroying by... 

Merge "Fixing activity referred after destroying by PinnedStackAnimationListener" into ub-launcher3-master
parents 7edcd780 c4c16e7a

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

+20 −9
Original line number Diff line number Diff line
@@ -274,15 +274,8 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
        }

    };



    private final IPinnedStackAnimationListener mIPinnedStackAnimationListener =

            new IPinnedStackAnimationListener.Stub() {

        @Override

        public void onPinnedStackAnimationStarted() {

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

            // animation to be created

            mActivity.clearForceInvisibleFlag(STATE_HANDLER_INVISIBILITY_FLAGS);

        }

    };

    private final PinnedStackAnimationListener mIPinnedStackAnimationListener =

            new PinnedStackAnimationListener();



    // Used to keep track of the last requested task list id, so that we do not request to load the

    // tasks again if we have already requested it and the task list has not changed
@@ -470,6 +463,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
        mSyncTransactionApplier = new SyncRtSurfaceTransactionApplierCompat(this);

        RecentsModel.INSTANCE.get(getContext()).addThumbnailChangeListener(this);

        mIdp.addOnChangeListener(this);

        mIPinnedStackAnimationListener.setActivity(mActivity);

        SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(

                mIPinnedStackAnimationListener);

    }
@@ -485,6 +479,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
        RecentsModel.INSTANCE.get(getContext()).removeThumbnailChangeListener(this);

        mIdp.removeOnChangeListener(this);

        SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(null);

        mIPinnedStackAnimationListener.setActivity(null);

    }



    @Override
@@ -2047,4 +2042,20 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
        /** @param isEmpty Whether RecentsView is empty (i.e. has no children) */

        void onEmptyMessageUpdated(boolean isEmpty);

    }



    private static class PinnedStackAnimationListener<T extends BaseActivity> extends

            IPinnedStackAnimationListener.Stub {

        private T mActivity;



        public void setActivity(T activity) {

            mActivity = activity;

        }



        @Override

        public void onPinnedStackAnimationStarted() {

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

            // animation to be created

            mActivity.clearForceInvisibleFlag(STATE_HANDLER_INVISIBILITY_FLAGS);

        }

    }

}