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

Merge "Fixed attaching nav to app not working for notification case" into sc-dev

Browse Source
This commit is contained in:
Shawn Lin
2021-04-15 04:35:18 +00:00
committed by Android (Google) Code Review
parent 801ff1c44b 728f5d71cc
commit e356c06ba5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -313,12 +313,14 @@ class ActivityLaunchAnimator(context: Context) {
}
context.mainExecutor.execute {
startAnimation(remoteAnimationTargets, iRemoteAnimationFinishedCallback)
startAnimation(remoteAnimationTargets, remoteAnimationNonAppTargets,
iRemoteAnimationFinishedCallback)
}
}
private fun startAnimation(
remoteAnimationTargets: Array<out RemoteAnimationTarget>,
remoteAnimationNonAppTargets: Array<out RemoteAnimationTarget>,
iCallback: IRemoteAnimationFinishedCallback
) {
val window = remoteAnimationTargets.firstOrNull {
@@ -332,7 +334,7 @@ class ActivityLaunchAnimator(context: Context) {
return
}
val navigationBar = remoteAnimationTargets.firstOrNull {
val navigationBar = remoteAnimationNonAppTargets.firstOrNull {
it.windowType == WindowManager.LayoutParams.TYPE_NAVIGATION_BAR
}