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

Merge "Swap z-order of tasks for default wallpaper-open animation" into udc-dev am: 34fb513c85

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

Change-Id: I257a8443d3e0e756159b6eeaa666510ea98e67e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Evan Rosky
2023-05-12 05:16:48 +00:00
committed by Automerger Merge Worker
parent a7d2c10808 34fb513c85
commit 914c5bb61a
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java
View File

@@ -435,6 +435,23 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler {
backgroundColorForTransition = backgroundColorForTransition =
uiContext.getColor(R.color.overview_background); uiContext.getColor(R.color.overview_background);
} }
if (wallpaperTransit == WALLPAPER_TRANSITION_OPEN
&& TransitionUtil.isOpeningType(info.getType())) {
// Need to flip the z-order of opening/closing because the WALLPAPER_OPEN
// always animates the closing task over the opening one while
// traditionally, an OPEN transition animates the opening over the closing.
// See Transitions#setupAnimHierarchy for details about these variables.
final int numChanges = info.getChanges().size();
final int zSplitLine = numChanges + 1;
if (TransitionUtil.isOpeningType(mode)) {
final int layer = zSplitLine - i;
startTransaction.setLayer(change.getLeash(), layer);
} else if (TransitionUtil.isClosingType(mode)) {
final int layer = zSplitLine + numChanges - i;
startTransaction.setLayer(change.getLeash(), layer);
}
}
} }
final float cornerRadius; final float cornerRadius;