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

Commit 05167371 authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Reset state after split launch animation finishes 

Previously we were clearing SplitSelectStateController
state too soon for fake landscape case where
as soon as the tasks launch the device does a rotation
animation since the new split tasks are in landscape.
Move restting state after animation finishes.

Fixes: 201980666

Change-Id: I23efd59fad444c47ae6c2048888a8570f22610fd
parent fd326d1a

quickstep/src/com/android/quickstep/util/SplitSelectStateController.java

+2 −5
Original line number Diff line number Diff line
@@ -163,10 +163,8 @@ public class SplitSelectStateController { 
                                if (mSuccessCallback != null) {

                                    mSuccessCallback.accept(true);

                                }

                            }));



            // After successful launch, call resetState

                                resetState();

                            }));

        }



        @Override
@@ -175,9 +173,8 @@ public class SplitSelectStateController { 
                if (mSuccessCallback != null) {

                    mSuccessCallback.accept(false);

                }

            });



                resetState();

            });

        }

    }

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

+5 −3
Original line number Diff line number Diff line
@@ -3918,7 +3918,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 


    /** TODO(b/181707736) More gracefully handle exiting split selection state */

    private void resetFromSplitSelectionState() {

        mSplitHiddenTaskView.setTranslationY(0);

        if (!showAsGrid()) {

            int pageToSnapTo = mCurrentPage;

            if (mSplitHiddenTaskViewIndex <= pageToSnapTo) {
@@ -3930,9 +3929,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
        }

        onLayout(false /*  changed */, getLeft(), getTop(), getRight(), getBottom());

        resetTaskVisuals();

        mSplitHiddenTaskViewIndex = -1;

        if (mSplitHiddenTaskView != null) {

            mSplitHiddenTaskView.setTranslationY(0);

            mSplitHiddenTaskView.setVisibility(VISIBLE);

            mSplitHiddenTaskView = null;

        mSplitHiddenTaskViewIndex = -1;

        }

        if (mFirstFloatingTaskView != null) {

            mActivity.getRootView().removeView(mFirstFloatingTaskView);

            mFirstFloatingTaskView = null;