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

Commit a722a063 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Detect 3p launcher move-to-front during recents." into udc-dev am: 76fad89c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23608057



Change-Id: Id8f8557a0af5426e3d594fb40e866539e9a1a356
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd30cd61 76fad89c

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -598,6 +598,17 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
                    // Don't consider order-only & non-leaf changes as changing apps.

                    // Don't consider order-only & non-leaf changes as changing apps.

                    if (!TransitionUtil.isOrderOnly(change) && isLeafTask) {

                    if (!TransitionUtil.isOrderOnly(change) && isLeafTask) {

                        hasChangingApp = true;

                        hasChangingApp = true;

                    } else if (isLeafTask && taskInfo.topActivityType == ACTIVITY_TYPE_HOME

                            && !mRecentsTask.equals(change.getContainer())) {

                        // Unless it is a 3p launcher. This means that the 3p launcher was already

                        // visible (eg. the "pausing" task is translucent over the 3p launcher).

                        // Treat it as if we are "re-opening" the 3p launcher.

                        if (openingTasks == null) {

                            openingTasks = new ArrayList<>();

                            openingTaskIsLeafs = new IntArray();

                        }

                        openingTasks.add(change);

                        openingTaskIsLeafs.add(1);

                    }

                    }

                }

                }

            }

            }