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

Commit 5a44da43 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by android-build-merger
Browse files

Merge "Use alpha instead of show/hide when creating animation leashes." into... 

Merge "Use alpha instead of show/hide when creating animation leashes." into qt-r1-dev am: 7e042c42
am: c046b288

Change-Id: I552519896146aca459d2ecfe4062bca49438c493
parents 2aab6ad3 c046b288

services/core/java/com/android/server/wm/SurfaceAnimationRunner.java

+3 −1
Original line number Diff line number Diff line
@@ -193,7 +193,9 @@ class SurfaceAnimationRunner { 
            public void onAnimationStart(Animator animation) {

                synchronized (mCancelLock) {

                    if (!a.mCancelled) {

                        mFrameTransaction.show(a.mLeash);

                        // TODO: change this back to use show instead of alpha when b/138459974 is

                        // fixed.

                        mFrameTransaction.setAlpha(a.mLeash, 1);

                    }

                }

            }

services/core/java/com/android/server/wm/SurfaceAnimator.java

+3 −3
Original line number Diff line number Diff line
@@ -324,9 +324,9 @@ class SurfaceAnimator { 
                .setName(surface + " - animation-leash");

        final SurfaceControl leash = builder.build();

        t.setWindowCrop(leash, width, height);

        if (!hidden) {

        t.show(leash);

        }

        // TODO: change this back to use show instead of alpha when b/138459974 is fixed.

        t.setAlpha(leash, hidden ? 0 : 1);

        t.reparent(surface, leash);

        return leash;

    }