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

Commit 2f7bdbc1 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: af715328 

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

Change-Id: I0d219b0d1eda1a258d08c60fe603eaccba0470cc
parents e4515cbf af715328

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()