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

Commit d66fa135 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...

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

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



Change-Id: Ia0784f9a85223b44c07d3a3662b2e4de418ec72d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12384071 f284e20e
Loading
Loading
Loading
Loading
+11 −2
Original line number Diff line number Diff line
@@ -750,8 +750,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);