Merge "Use postStartActivityDismissingKeyguard when showOnLockscreen is false." into tm-qpr-dev (eed2d8f0) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt

+12 −7

Original line number	Diff line number	Diff line
		@@ -234,19 +234,24 @@ class LockscreenSmartspaceController @Inject constructor(

		ssView.setIntentStarter(object : BcSmartspaceDataPlugin.IntentStarter {
		override fun startIntent(view: View, intent: Intent, showOnLockscreen: Boolean) {
		if (showOnLockscreen) {
		activityStarter.startActivity(
		intent,
		true, /* dismissShade */
		null, /* launch animator - looks bad with the transparent smartspace bg */
		showOnLockscreen
		// launch animator - looks bad with the transparent smartspace bg
		null,
		true
		)
		} else {
		activityStarter.postStartActivityDismissingKeyguard(intent, 0)
		}
		}

		override fun startPendingIntent(pi: PendingIntent, showOnLockscreen: Boolean) {
		if (showOnLockscreen) {
		pi.send()
		} else {
		activityStarter.startPendingIntentDismissingKeyguard(pi)
		activityStarter.postStartActivityDismissingKeyguard(pi)
		}
		}
		})