Merge "Merge "Remove animation controller" into sc-v2-dev am: 1cb6db3310 am: 95e54713fc" (68f50b99) · Commits · e / os / android_frameworks_base

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

+5 −11

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ import android.view.View
		import android.view.ViewGroup
		import com.android.settingslib.Utils
		import com.android.systemui.R
		import com.android.systemui.animation.ActivityLaunchAnimator
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.plugins.ActivityStarter
		@@ -190,24 +189,19 @@ class LockscreenSmartspaceController @Inject constructor(
		val ssView = plugin.getView(parent)
		ssView.registerDataProvider(plugin)

		val animationController = ActivityLaunchAnimator.Controller.fromView(
		ssView as View,
		null /* cujType */
		)

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

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