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

Merge "Only run Animation#setBackdropColor on overriden app transition" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-28 12:58:29 +00:00
committed by Android (Google) Code Review
parent 12873579dc 96b645d043
commit 2b70f83f9e
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/AppTransition.java
View File

@@ -683,6 +683,9 @@ public class AppTransition implements Dump {
} else if (mNextAppTransitionType == NEXT_TRANSIT_TYPE_CUSTOM) {
a = mTransitionAnimation.loadAppTransitionAnimation(mNextAppTransitionPackage,
enter ? mNextAppTransitionEnter : mNextAppTransitionExit);
if (mNextAppTransitionBackgroundColor != 0) {
a.setBackdropColor(mNextAppTransitionBackgroundColor);
}
ProtoLog.v(WM_DEBUG_APP_TRANSITIONS_ANIM,
"applyAnimation: anim=%s nextAppTransition=ANIM_CUSTOM transit=%s "
+ "isEntrance=%b Callers=%s",
@@ -842,10 +845,6 @@ public class AppTransition implements Dump {
}
setAppTransitionFinishedCallbackIfNeeded(a);
if (mNextAppTransitionBackgroundColor != 0) {
a.setBackdropColor(mNextAppTransitionBackgroundColor);
}
return a;
}