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

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

Merge "Fix the split divider position being shifted during animating" into... 

Merge "Fix the split divider position being shifted during animating" into udc-dev am: 4c77d932 am: 72b4cb84

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



Change-Id: I219b31cdebb3c177800a995a52815fa622fdc8a1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4c2af73c 72b4cb84

libs/WindowManager/Shell/src/com/android/wm/shell/util/TransitionUtil.java

+8 −1
Original line number Diff line number Diff line
@@ -170,6 +170,9 @@ public class TransitionUtil { 
            if (isOpeningType(mode)) {

                t.setAlpha(leash, 0.f);

            }

            // Set the transition leash position to 0 in case the divider leash position being

            // taking down.

            t.setPosition(leash, 0, 0);

            t.setLayer(leash, Integer.MAX_VALUE);

            return;

        }
@@ -228,7 +231,11 @@ public class TransitionUtil { 
        t.reparent(change.getLeash(), leashSurface);

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

        t.show(change.getLeash());

        if (!isDividerBar(change)) {

            // For divider, don't modify its inner leash position when creating the outer leash

            // for the transition. In case the position being wrong after the transition finished.

            t.setPosition(change.getLeash(), 0, 0);

        }

        t.setLayer(change.getLeash(), 0);

        return leashSurface;

    }