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

Commit 0c625f74 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Originate split select animation from the original icon view instead of... 

Merge "Originate split select animation from the original icon view instead of the split menu icon" into tm-dev
parents df073f0e 02353703

quickstep/src/com/android/launcher3/popup/QuickstepSystemShortcut.java

+2 −1
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ public interface QuickstepSystemShortcut { 


            RecentsView recentsView = mTarget.getOverviewPanel();

            recentsView.initiateSplitSelect(

                    new SplitSelectSource(view, new BitmapDrawable(bitmap), intent, mPosition));

                    new SplitSelectSource(mOriginalView, new BitmapDrawable(bitmap), intent,

                            mPosition));

        }

    }

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

+7 −0
Original line number Diff line number Diff line
@@ -196,6 +196,13 @@ public class FloatingTaskView extends FrameLayout { 
                    0, 1, ACCEL);

            animation.addFloat(mThumbnailView, LauncherAnimUtils.VIEW_ALPHA,

                    1, 0, DEACCEL_3);

        } else if (isStagedTask) {

            // Fade in the placeholder view when split is initiated from homescreen / all apps

            // icons.

            if (mSplitPlaceholderView.getAlpha() == 0) {

                animation.addFloat(mSplitPlaceholderView, SplitPlaceholderView.ALPHA_FLOAT,

                        0.3f, 1, ACCEL);

            }

        }



        MultiValueUpdateListener listener = new MultiValueUpdateListener() {

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

+5 −6
Original line number Diff line number Diff line
@@ -2757,16 +2757,15 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
                    mSplitHiddenTaskView.getThumbnail().getThumbnail(),

                    mSplitHiddenTaskView.getIconView().getDrawable(), startingTaskRect);

            mFirstFloatingTaskView.setAlpha(1);

            mFirstFloatingTaskView.addAnimation(anim, startingTaskRect,

                    mTempRect, true /* fadeWithThumbnail */, true /* isStagedTask */);

            mFirstFloatingTaskView.addAnimation(anim, startingTaskRect, mTempRect,

                    true /* fadeWithThumbnail */, true /* isStagedTask */);

        } else {

            mSplitSelectSource.view.setVisibility(INVISIBLE);

            mFirstFloatingTaskView = FloatingTaskView.getFloatingTaskView(mActivity,

                    mSplitSelectSource.view, null,

                    mSplitSelectSource.view, null /* thumbnail */,

                    mSplitSelectSource.drawable, startingTaskRect);

            mFirstFloatingTaskView.setAlpha(1);

            mFirstFloatingTaskView.addAnimation(anim, startingTaskRect,

                    mTempRect, true /* fadeWithThumbnail */, true /* isStagedTask */);

            mFirstFloatingTaskView.addAnimation(anim, startingTaskRect, mTempRect,

                    false /* fadeWithThumbnail */, true /* isStagedTask */);

        }

        InteractionJankMonitorWrapper.begin(this,

                InteractionJankMonitorWrapper.CUJ_SPLIT_SCREEN_ENTER, "First tile selected");