Merge "Fixed attaching nav to app not working for notification case" into sc-dev (e356c06b) · Commits · e / os / android_frameworks_base

packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt

+4 −2

Original line number	Diff line number	Diff line
		@@ -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
		}