Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I0d219b0d1eda1a258d08c60fe603eaccba0470cc
This commit is contained in:
Chris Li
2021-12-04 05:20:18 +00:00
committed by Automerger Merge Worker
parent e4515cbf07 af715328d3
commit 2f7bdbc104
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/RemoteAnimationTarget.java
View File

@@ -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 * 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 * to preserve original z-layer order in the hierarchy tree assuming no "boosting" needs to
* happen. * 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 @UnsupportedAppUsage
public final int prefixOrderIndex; public final int prefixOrderIndex;

1
packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt
View File

@@ -436,7 +436,6 @@ class ActivityLaunchAnimator(private val launchAnimator: LaunchAnimator) {
.withAlpha(1f) .withAlpha(1f)
.withMatrix(matrix) .withMatrix(matrix)
.withWindowCrop(windowCrop) .withWindowCrop(windowCrop)
.withLayer(window.prefixOrderIndex)
.withCornerRadius(cornerRadius) .withCornerRadius(cornerRadius)
.withVisibility(true) .withVisibility(true)
.build() .build()