Merge "Device Controls - Supporting activity launch" into sc-qpr1-dev (b6dfc45c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -256,13 +256,13 @@ class ControlsUiControllerImpl @Inject constructor (
		// Force animations when transitioning from a dialog to an activity
		intent.putExtra(ControlsUiController.EXTRA_ANIMATE, true)

		if (keyguardStateController.isUnlocked()) {
		if (keyguardStateController.isShowing()) {
		activityStarter.postStartActivityDismissingKeyguard(intent, 0 /* delay */)
		} else {
		activityContext.startActivity(
		intent,
		ActivityOptions.makeSceneTransitionAnimation(activityContext as Activity).toBundle()
		)
		} else {
		activityStarter.postStartActivityDismissingKeyguard(intent, 0 /* delay */)
		}
		}