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 am: 1cb6db3310

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16147998

Change-Id: Idf7372cc658e7aadba0e1658f3338a3c1f619314
This commit is contained in:
TreeHugger Robot
2021-10-29 17:55:22 +00:00
committed by Automerger Merge Worker
parent 244802fb72 1cb6db3310
commit 95e54713fc
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 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)
}