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

Commit 2e952bf4 authored by Matt Pietal's avatar Matt Pietal
Browse files

Remove animation controller 

The animation controller doesn't work well with the transparent
smartspace content. Don't use it.

Bug: 203775218
Test: manual

Change-Id: I3d8d7c8271cc7e7a0758a2c15df6d15155361697
parent 327615d6

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)

                }