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

Commit f9ed2a09 authored by Vinit Nayak's avatar Vinit Nayak Committed by Automerger Merge Worker
Browse files

Merge "Finish recents animation for app-icon tap" into sc-v2-dev am: 185da72e 

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

Change-Id: Icfaddc538c171f09a65efd0d82bb869228518c44
parents 29cb9757 185da72e

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

+6 −2
Original line number Diff line number Diff line
@@ -1343,8 +1343,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
            addView(taskView);



            if (hasMultipleTasks) {

                ((GroupedTaskView) taskView).bind(groupTask.task1, groupTask.task2,

                        mOrientationState, groupTask.mStagedSplitBounds);

                boolean firstTaskIsLeftTopTask =

                        groupTask.mStagedSplitBounds.leftTopTaskId == groupTask.task1.key.id;

                Task leftTopTask = firstTaskIsLeftTopTask ? groupTask.task1 : groupTask.task2;

                Task rightBottomTask = firstTaskIsLeftTopTask ? groupTask.task2 : groupTask.task1;

                ((GroupedTaskView) taskView).bind(leftTopTask, rightBottomTask, mOrientationState,

                        groupTask.mStagedSplitBounds);

            } else {

                taskView.bind(groupTask.task1, mOrientationState);

            }

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

+9 −1
Original line number Diff line number Diff line
@@ -851,7 +851,15 @@ public class TaskView extends FrameLayout implements Reusable { 
                if (confirmSecondSplitSelectApp()) {

                    return;

                }

                if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask()) {

                    RecentsView recentsView = getRecentsView();

                    recentsView.switchToScreenshot(

                            () -> recentsView.finishRecentsAnimation(true /* toRecents */,

                                    false /* shouldPip */,

                                    () -> showTaskMenu(iconView)));

                } else {

                    showTaskMenu(iconView);

                }

            });

            iconView.setOnLongClickListener(v -> {

                requestDisallowInterceptTouchEvent(true);