Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95e54713 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove animation controller" into sc-v2-dev am: 1cb6db33 

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

Change-Id: Idf7372cc658e7aadba0e1658f3338a3c1f619314
parents 244802fb 1cb6db33

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)

                }