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

Commit f284e20e authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Fix regression with the closing task leash visibility" into udc-qpr-dev am: 4760de84 

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



Change-Id: I9a84ab526def67a60007a76a0722b4f8f2ccf093
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 263d8211 4760de84

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

+11 −2
Original line number Diff line number Diff line
@@ -738,8 +738,17 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
                        final boolean wasClosing = closingIdx >= 0;

                        t.reparent(target.leash, mInfo.getRoot(rootIdx).getLeash());

                        t.setLayer(target.leash, layer);

                        // Hide the animation leash if not already visible, let listener show it

                        t.setVisibility(target.leash, !wasClosing);

                        if (wasClosing) {

                            // App was previously visible and is closing

                            t.show(target.leash);

                            t.setAlpha(target.leash, 1f);

                            // Also override the task alpha as it was set earlier when dispatching

                            // the transition and setting up the leash to hide the

                            t.setAlpha(change.getLeash(), 1f);

                        } else {

                            // Hide the animation leash, let the listener show it

                            t.hide(target.leash);

                        }

                        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION,

                                "  opening new leaf taskId=%d wasClosing=%b",

                                target.taskId, wasClosing);