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

Commit 0529dbe4 authored by Jeremy Sim's avatar Jeremy Sim Committed by Automerger Merge Worker
Browse files

Merge "Fix two issues with splitting from Taskbar" into tm-qpr-dev am: b439c837 am: 0389929e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21966877



Change-Id: I89e1057e9d11c22e06e3dd1bd42851d83fee06f5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7654a32a 0389929e

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

+7 −5
Original line number Diff line number Diff line
@@ -3166,6 +3166,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
                InteractionJankMonitorWrapper.cancel(

                        InteractionJankMonitorWrapper.CUJ_SPLIT_SCREEN_ENTER);

            }



            updateCurrentTaskActionsVisibility();

        });

    }
@@ -4666,6 +4668,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
            mSecondSplitHiddenView = null;

        }



        // We are leaving split selection state, so it is safe to reset thumbnail translations for

        // the next time split is invoked.

        setTaskViewsPrimarySplitTranslation(0);

        setTaskViewsSecondarySplitTranslation(0);



        if (mSplitHiddenTaskViewIndex == -1) {

            return;

        }
@@ -4680,11 +4687,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
        }

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



        // We are leaving split selection state, so it is safe to reset thumbnail translations for

        // the next time split is invoked.

        setTaskViewsPrimarySplitTranslation(0);

        setTaskViewsSecondarySplitTranslation(0);



        resetTaskVisuals();

        mSplitHiddenTaskViewIndex = -1;

        if (mSplitHiddenTaskView != null) {