Merge "Don't blur during app launch animations" into sc-dev (d377bbc2) · Commits · e / os / android_frameworks_base

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -159,6 +159,7 @@ class ActivityLaunchAnimator(
	// If we expect an animation, post a timeout to cancel it in case the remote animation is		// If we expect an animation, post a timeout to cancel it in case the remote animation is
	// never started.		// never started.
	if (willAnimate) {		if (willAnimate) {
			keyguardHandler.disableKeyguardBlurs()
	runner.postTimeout()		runner.postTimeout()

	// Hide the keyguard using the launch animation instead of the default unlock animation.		// Hide the keyguard using the launch animation instead of the default unlock animation.
	@@ -218,6 +219,9 @@ class ActivityLaunchAnimator(

	/** Hide the keyguard and animate using [runner]. */		/** Hide the keyguard and animate using [runner]. */
	fun hideKeyguardWithAnimation(runner: IRemoteAnimationRunner)		fun hideKeyguardWithAnimation(runner: IRemoteAnimationRunner)

			/ Disable window blur so they don't overlap with the window launch animation /
			fun disableKeyguardBlurs()
	}		}

	/**		/**

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -110,6 +110,7 @@ import com.android.systemui.navigationbar.NavigationModeController;
	import com.android.systemui.plugins.statusbar.StatusBarStateController;		import com.android.systemui.plugins.statusbar.StatusBarStateController;
	import com.android.systemui.shared.system.QuickStepContract;		import com.android.systemui.shared.system.QuickStepContract;
	import com.android.systemui.statusbar.CommandQueue;		import com.android.systemui.statusbar.CommandQueue;
			import com.android.systemui.statusbar.NotificationShadeDepthController;
	import com.android.systemui.statusbar.SysuiStatusBarStateController;		import com.android.systemui.statusbar.SysuiStatusBarStateController;
	import com.android.systemui.statusbar.phone.BiometricUnlockController;		import com.android.systemui.statusbar.phone.BiometricUnlockController;
	import com.android.systemui.statusbar.phone.DozeParameters;		import com.android.systemui.statusbar.phone.DozeParameters;
	@@ -240,6 +241,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
	private final SysuiStatusBarStateController mStatusBarStateController;		private final SysuiStatusBarStateController mStatusBarStateController;
	private final Executor mUiBgExecutor;		private final Executor mUiBgExecutor;
	private final UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;		private final UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;
			private final Lazy<NotificationShadeDepthController> mNotificationShadeDepthController;

	private boolean mSystemReady;		private boolean mSystemReady;
	private boolean mBootCompleted;		private boolean mBootCompleted;
	@@ -810,13 +812,15 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
	SysuiStatusBarStateController statusBarStateController,		SysuiStatusBarStateController statusBarStateController,
	KeyguardStateController keyguardStateController,		KeyguardStateController keyguardStateController,
	Lazy<KeyguardUnlockAnimationController> keyguardUnlockAnimationControllerLazy,		Lazy<KeyguardUnlockAnimationController> keyguardUnlockAnimationControllerLazy,
	UnlockedScreenOffAnimationController unlockedScreenOffAnimationController) {		UnlockedScreenOffAnimationController unlockedScreenOffAnimationController,
			Lazy<NotificationShadeDepthController> notificationShadeDepthController) {
	super(context);		super(context);
	mFalsingCollector = falsingCollector;		mFalsingCollector = falsingCollector;
	mLockPatternUtils = lockPatternUtils;		mLockPatternUtils = lockPatternUtils;
	mBroadcastDispatcher = broadcastDispatcher;		mBroadcastDispatcher = broadcastDispatcher;
	mKeyguardViewControllerLazy = statusBarKeyguardViewManagerLazy;		mKeyguardViewControllerLazy = statusBarKeyguardViewManagerLazy;
	mDismissCallbackRegistry = dismissCallbackRegistry;		mDismissCallbackRegistry = dismissCallbackRegistry;
			mNotificationShadeDepthController = notificationShadeDepthController;
	mUiBgExecutor = uiBgExecutor;		mUiBgExecutor = uiBgExecutor;
	mUpdateMonitor = keyguardUpdateMonitor;		mUpdateMonitor = keyguardUpdateMonitor;
	mPM = powerManager;		mPM = powerManager;
	@@ -1657,6 +1661,14 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
	hideLocked();		hideLocked();
	}		}

			/**
			* Disable notification shade background blurs until the keyguard is dismissed.
			* (Used during app launch animations)
			*/
			public void disableBlursUntilHidden() {
			mNotificationShadeDepthController.get().setIgnoreShadeBlurUntilHidden(true);
			}

	public boolean isSecure() {		public boolean isSecure() {
	return isSecure(KeyguardUpdateMonitor.getCurrentUser());		return isSecure(KeyguardUpdateMonitor.getCurrentUser());
	}		}

packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -46,6 +46,7 @@ import com.android.systemui.keyguard.KeyguardUnlockAnimationController;
	import com.android.systemui.keyguard.KeyguardViewMediator;		import com.android.systemui.keyguard.KeyguardViewMediator;
	import com.android.systemui.navigationbar.NavigationModeController;		import com.android.systemui.navigationbar.NavigationModeController;
	import com.android.systemui.plugins.statusbar.StatusBarStateController;		import com.android.systemui.plugins.statusbar.StatusBarStateController;
			import com.android.systemui.statusbar.NotificationShadeDepthController;
	import com.android.systemui.statusbar.NotificationShadeWindowController;		import com.android.systemui.statusbar.NotificationShadeWindowController;
	import com.android.systemui.statusbar.SysuiStatusBarStateController;		import com.android.systemui.statusbar.SysuiStatusBarStateController;
	import com.android.systemui.statusbar.phone.DozeParameters;		import com.android.systemui.statusbar.phone.DozeParameters;
	@@ -99,7 +100,8 @@ public class KeyguardModule {
	SysuiStatusBarStateController statusBarStateController,		SysuiStatusBarStateController statusBarStateController,
	KeyguardStateController keyguardStateController,		KeyguardStateController keyguardStateController,
	Lazy<KeyguardUnlockAnimationController> keyguardUnlockAnimationController,		Lazy<KeyguardUnlockAnimationController> keyguardUnlockAnimationController,
	UnlockedScreenOffAnimationController unlockedScreenOffAnimationController) {		UnlockedScreenOffAnimationController unlockedScreenOffAnimationController,
			Lazy<NotificationShadeDepthController> notificationShadeDepthController) {
	return new KeyguardViewMediator(		return new KeyguardViewMediator(
	context,		context,
	falsingCollector,		falsingCollector,
	@@ -119,7 +121,8 @@ public class KeyguardModule {
	statusBarStateController,		statusBarStateController,
	keyguardStateController,		keyguardStateController,
	keyguardUnlockAnimationController,		keyguardUnlockAnimationController,
	unlockedScreenOffAnimationController		unlockedScreenOffAnimationController,
			notificationShadeDepthController
	);		);
	}		}

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt

+6 −12

Original line number	Original line	Diff line number	Diff line
	@@ -35,7 +35,6 @@ import com.android.systemui.animation.Interpolators
	import com.android.systemui.dagger.SysUISingleton		import com.android.systemui.dagger.SysUISingleton
	import com.android.systemui.dump.DumpManager		import com.android.systemui.dump.DumpManager
	import com.android.systemui.plugins.statusbar.StatusBarStateController		import com.android.systemui.plugins.statusbar.StatusBarStateController
	import com.android.systemui.statusbar.notification.ExpandAnimationParameters
	import com.android.systemui.statusbar.phone.BiometricUnlockController		import com.android.systemui.statusbar.phone.BiometricUnlockController
	import com.android.systemui.statusbar.phone.BiometricUnlockController.MODE_WAKE_AND_UNLOCK		import com.android.systemui.statusbar.phone.BiometricUnlockController.MODE_WAKE_AND_UNLOCK
	import com.android.systemui.statusbar.phone.DozeParameters		import com.android.systemui.statusbar.phone.DozeParameters
	@@ -79,7 +78,6 @@ class NotificationShadeDepthController @Inject constructor(
	private var notificationAnimator: Animator? = null		private var notificationAnimator: Animator? = null
	private var updateScheduled: Boolean = false		private var updateScheduled: Boolean = false
	private var shadeExpansion = 0f		private var shadeExpansion = 0f
	private var ignoreShadeBlurUntilHidden: Boolean = false
	private var isClosed: Boolean = true		private var isClosed: Boolean = true
	private var isOpen: Boolean = false		private var isOpen: Boolean = false
	private var isBlurred: Boolean = false		private var isBlurred: Boolean = false
	@@ -119,18 +117,17 @@ class NotificationShadeDepthController @Inject constructor(
	* When launching an app from the shade, the animations progress should affect how blurry the		* When launching an app from the shade, the animations progress should affect how blurry the
	* shade is, overriding the expansion amount.		* shade is, overriding the expansion amount.
	*/		*/
	var notificationLaunchAnimationParams: ExpandAnimationParameters? = null		var ignoreShadeBlurUntilHidden: Boolean = false
	set(value) {		set(value) {
	field = value		if (field == value) {
	if (value != null) {
	scheduleUpdate()
	return		return
	}		}
			field = value
			scheduleUpdate()

	if (shadeSpring.radius == 0 && shadeAnimation.radius == 0) {		if (shadeSpring.radius == 0 && shadeAnimation.radius == 0) {
	return		return
	}		}
	ignoreShadeBlurUntilHidden = true
	shadeSpring.animateTo(0)		shadeSpring.animateTo(0)
	shadeSpring.finishIfRunning()		shadeSpring.finishIfRunning()

	@@ -171,8 +168,6 @@ class NotificationShadeDepthController @Inject constructor(
	combinedBlur = max(combinedBlur, blurUtils.blurRadiusOfRatio(qsPanelExpansion))		combinedBlur = max(combinedBlur, blurUtils.blurRadiusOfRatio(qsPanelExpansion))
	combinedBlur = max(combinedBlur, blurUtils.blurRadiusOfRatio(transitionToFullShadeProgress))		combinedBlur = max(combinedBlur, blurUtils.blurRadiusOfRatio(transitionToFullShadeProgress))
	var shadeRadius = max(combinedBlur, wakeAndUnlockBlurRadius).toFloat()		var shadeRadius = max(combinedBlur, wakeAndUnlockBlurRadius).toFloat()
	val launchProgress = notificationLaunchAnimationParams?.linearProgress ?: 0f
	shadeRadius = (1f - launchProgress) (1f - launchProgress)

	if (ignoreShadeBlurUntilHidden) {		if (ignoreShadeBlurUntilHidden) {
	if (shadeRadius == 0f) {		if (shadeRadius == 0f) {
	@@ -195,7 +190,8 @@ class NotificationShadeDepthController @Inject constructor(
	blur = 0		blur = 0
	}		}

	blurUtils.applyBlur(blurRoot?.viewRootImpl ?: root.viewRootImpl, blur, scrimsVisible)		val opaque = scrimsVisible && !ignoreShadeBlurUntilHidden
			blurUtils.applyBlur(blurRoot?.viewRootImpl ?: root.viewRootImpl, blur, opaque)
	val zoomOut = blurUtils.ratioOfBlurRadius(blur)		val zoomOut = blurUtils.ratioOfBlurRadius(blur)
	try {		try {
	if (root.isAttachedToWindow && root.windowToken != null) {		if (root.isAttachedToWindow && root.windowToken != null) {
	@@ -430,8 +426,6 @@ class NotificationShadeDepthController @Inject constructor(
	it.println("shadeAnimation: ${shadeAnimation.radius}")		it.println("shadeAnimation: ${shadeAnimation.radius}")
	it.println("globalActionsRadius: ${globalActionsSpring.radius}")		it.println("globalActionsRadius: ${globalActionsSpring.radius}")
	it.println("wakeAndUnlockBlur: $wakeAndUnlockBlurRadius")		it.println("wakeAndUnlockBlur: $wakeAndUnlockBlurRadius")
	it.println("notificationLaunchAnimationProgress: " +
	"${notificationLaunchAnimationParams?.linearProgress}")
	it.println("ignoreShadeBlurUntilHidden: $ignoreShadeBlurUntilHidden")		it.println("ignoreShadeBlurUntilHidden: $ignoreShadeBlurUntilHidden")
	}		}
	}		}

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationLaunchAnimatorController.kt

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -3,7 +3,6 @@ package com.android.systemui.statusbar.notification
	import android.view.ViewGroup		import android.view.ViewGroup
	import com.android.internal.jank.InteractionJankMonitor		import com.android.internal.jank.InteractionJankMonitor
	import com.android.systemui.animation.ActivityLaunchAnimator		import com.android.systemui.animation.ActivityLaunchAnimator
	import com.android.systemui.statusbar.NotificationShadeDepthController
	import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow		import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow
	import com.android.systemui.statusbar.notification.stack.NotificationListContainer		import com.android.systemui.statusbar.notification.stack.NotificationListContainer
	import com.android.systemui.statusbar.phone.HeadsUpManagerPhone		import com.android.systemui.statusbar.phone.HeadsUpManagerPhone
	@@ -15,7 +14,6 @@ import kotlin.math.max
	class NotificationLaunchAnimatorControllerProvider(		class NotificationLaunchAnimatorControllerProvider(
	private val notificationShadeWindowViewController: NotificationShadeWindowViewController,		private val notificationShadeWindowViewController: NotificationShadeWindowViewController,
	private val notificationListContainer: NotificationListContainer,		private val notificationListContainer: NotificationListContainer,
	private val depthController: NotificationShadeDepthController,
	private val headsUpManager: HeadsUpManagerPhone		private val headsUpManager: HeadsUpManagerPhone
	) {		) {
	fun getAnimatorController(		fun getAnimatorController(
	@@ -24,7 +22,6 @@ class NotificationLaunchAnimatorControllerProvider(
	return NotificationLaunchAnimatorController(		return NotificationLaunchAnimatorController(
	notificationShadeWindowViewController,		notificationShadeWindowViewController,
	notificationListContainer,		notificationListContainer,
	depthController,
	notification,		notification,
	headsUpManager		headsUpManager
	)		)
	@@ -39,7 +36,6 @@ class NotificationLaunchAnimatorControllerProvider(
	class NotificationLaunchAnimatorController(		class NotificationLaunchAnimatorController(
	private val notificationShadeWindowViewController: NotificationShadeWindowViewController,		private val notificationShadeWindowViewController: NotificationShadeWindowViewController,
	private val notificationListContainer: NotificationListContainer,		private val notificationListContainer: NotificationListContainer,
	private val depthController: NotificationShadeDepthController,
	private val notification: ExpandableNotificationRow,		private val notification: ExpandableNotificationRow,
	private val headsUpManager: HeadsUpManagerPhone		private val headsUpManager: HeadsUpManagerPhone
	) : ActivityLaunchAnimator.Controller {		) : ActivityLaunchAnimator.Controller {
	@@ -128,7 +124,6 @@ class NotificationLaunchAnimatorController(
	private fun applyParams(params: ExpandAnimationParameters?) {		private fun applyParams(params: ExpandAnimationParameters?) {
	notification.applyExpandAnimationParams(params)		notification.applyExpandAnimationParams(params)
	notificationListContainer.applyExpandAnimationParams(params)		notificationListContainer.applyExpandAnimationParams(params)
	depthController.notificationLaunchAnimationParams = params
	}		}

	override fun onLaunchAnimationProgress(		override fun onLaunchAnimationProgress(