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

Commit d206f4b3 authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Do not use prefixOrderIndex for animation layer" into sc-v2-dev am:... 

Merge "Do not use prefixOrderIndex for animation layer" into sc-v2-dev am: af715328 am: 2f7bdbc1

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

Change-Id: I16eb1a80291217f66ae318391cd7cbe6f08241fb
parents b3b4df95 2f7bdbc1

core/java/android/view/RemoteAnimationTarget.java

+4 −0
Original line number Diff line number Diff line
@@ -129,7 +129,11 @@ public class RemoteAnimationTarget implements Parcelable { 
     * The index of the element in the tree in prefix order. This should be used for z-layering

     * to preserve original z-layer order in the hierarchy tree assuming no "boosting" needs to

     * happen.

     * @deprecated WindowManager may set a z-order different from the prefix order, and has set the

     *             correct layer for the animation leash already, so this should not be used for

     *             layer any more.

     */

    @Deprecated

    @UnsupportedAppUsage

    public final int prefixOrderIndex;

packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt

+0 −1
Original line number Diff line number Diff line
@@ -436,7 +436,6 @@ class ActivityLaunchAnimator(private val launchAnimator: LaunchAnimator) { 
                .withAlpha(1f)

                .withMatrix(matrix)

                .withWindowCrop(windowCrop)

                .withLayer(window.prefixOrderIndex)

                .withCornerRadius(cornerRadius)

                .withVisibility(true)

                .build()