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

Commit 7a9b53cd authored by Tony Huang's avatar Tony Huang
Browse files

Fix surface didn't fade out when dismiss 

We did fade-out on snapshot if exist rather than surface itself
before due to the surface didn't have content. But this issue
seems had been fixed so it cause we cannot see the animation due
to the surface layer is higher than snapshot.

Now we can fade out the surface directly so just remove using
snapshot in this case.

Fix: 286353033
Test: manual
Test: pass existing tests
Change-Id: Icd04940f69b4a4102068be14785718ea8ae77a3a
parent c3b8dafb

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenTransitions.java

+1 −13
Original line number Diff line number Diff line
@@ -199,19 +199,7 @@ class SplitScreenTransitions { 
            boolean isOpening = TransitionUtil.isOpeningType(info.getType());

            if (!isOpening && (mode == TRANSIT_CLOSE || mode == TRANSIT_TO_BACK)) {

                // fade out

                if (change.getSnapshot() != null) {

                    // This case is happened if task is going to reparent to TDA, the origin leash

                    // doesn't rendor so we use snapshot to replace it animating.

                    t.reparent(change.getSnapshot(), info.getRoot(rootIdx).getLeash());

                    // Use origin leash layer.

                    t.setLayer(change.getSnapshot(), info.getChanges().size() - i);

                    t.setPosition(change.getSnapshot(), change.getStartAbsBounds().left,

                            change.getStartAbsBounds().top);

                    t.show(change.getSnapshot());

                    startFadeAnimation(change.getSnapshot(), false /* show */);

                } else {

                startFadeAnimation(leash, false /* show */);

                }

            } else if (mode == TRANSIT_CHANGE && change.getSnapshot() != null) {

                t.reparent(change.getSnapshot(), info.getRoot(rootIdx).getLeash());

                // Ensure snapshot it on the top of all transition surfaces