Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove animation controller" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-10-29 17:35:53 +00:00
committed by Android (Google) Code Review
parent b223ed581c 2e952bf417
commit 1cb6db3310
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,6 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import com.android.settingslib.Utils import com.android.settingslib.Utils
import com.android.systemui.R import com.android.systemui.R
import com.android.systemui.animation.ActivityLaunchAnimator
import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.dagger.qualifiers.Main
import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.ActivityStarter
@@ -190,24 +189,19 @@ class LockscreenSmartspaceController @Inject constructor(
val ssView = plugin.getView(parent) val ssView = plugin.getView(parent)
ssView.registerDataProvider(plugin) ssView.registerDataProvider(plugin)
val animationController = ActivityLaunchAnimator.Controller.fromView(
ssView as View,
null /* cujType */
)
ssView.setIntentStarter(object : BcSmartspaceDataPlugin.IntentStarter { 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( activityStarter.startActivity(
i, intent,
true, /* dismissShade */ true, /* dismissShade */
animationController, null, /* launch animator - looks bad with the transparent smartspace bg */
showOnLockscreen showOnLockscreen
) )
} }
override fun startPendingIntent(pi: PendingIntent?, showOnLockscreen: Boolean) { override fun startPendingIntent(pi: PendingIntent, showOnLockscreen: Boolean) {
if (showOnLockscreen) { if (showOnLockscreen) {
pi?.send() pi.send()
} else { } else {
activityStarter.startPendingIntentDismissingKeyguard(pi) activityStarter.startPendingIntentDismissingKeyguard(pi)
} }