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

Commit cb774da8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Put change type below closing type for a close transition" into udc-dev... 

Merge "Put change type below closing type for a close transition" into udc-dev am: 6aecb91b am: 6371a622

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



Change-Id: I78a435fd4e87b7f0412361f6e255c5bdeed99154
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47df7267 6371a622

libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java

+10 −2
Original line number Diff line number Diff line
@@ -501,7 +501,9 @@ public class Transitions implements RemoteCallable<Transitions>, 
     */

    private static void setupAnimHierarchy(@NonNull TransitionInfo info,

            @NonNull SurfaceControl.Transaction t, @NonNull SurfaceControl.Transaction finishT) {

        boolean isOpening = isOpeningType(info.getType());

        final int type = info.getType();

        final boolean isOpening = isOpeningType(type);

        final boolean isClosing = isClosingType(type);

        for (int i = 0; i < info.getRootCount(); ++i) {

            t.show(info.getRoot(i).getLeash());

        }
@@ -554,8 +556,14 @@ public class Transitions implements RemoteCallable<Transitions>, 
                    layer = zSplitLine + numChanges - i;

                }

            } else { // CHANGE or other

                if (isClosing) {

                    // Put below CLOSE mode.

                    layer = zSplitLine - i;

                } else {

                    // Put above CLOSE mode.

                    layer = zSplitLine + numChanges - i;

                }

            }

            t.setLayer(leash, layer);

        }

    }