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

Commit ec8a2040 authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Automerger Merge Worker
Browse files

Merge "Use postStartActivityDismissingKeyguard when showOnLockscreen is... 

Merge "Use postStartActivityDismissingKeyguard when showOnLockscreen is false." into tm-qpr-dev am: eed2d8f0

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



Change-Id: I55c3fd1fac711b44832553bc2c62655bacfdfa04
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1c5023d eed2d8f0

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

+12 −7
Original line number Diff line number Diff line
@@ -234,19 +234,24 @@ class LockscreenSmartspaceController @Inject constructor( 


        ssView.setIntentStarter(object : BcSmartspaceDataPlugin.IntentStarter {

            override fun startIntent(view: View, intent: Intent, showOnLockscreen: Boolean) {

                if (showOnLockscreen) {

                    activityStarter.startActivity(

                            intent,

                            true, /* dismissShade */

                    null, /* launch animator - looks bad with the transparent smartspace bg */

                    showOnLockscreen

                            // launch animator - looks bad with the transparent smartspace bg

                            null,

                            true

                    )

                } else {

                    activityStarter.postStartActivityDismissingKeyguard(intent, 0)

                }

            }



            override fun startPendingIntent(pi: PendingIntent, showOnLockscreen: Boolean) {

                if (showOnLockscreen) {

                    pi.send()

                } else {

                    activityStarter.startPendingIntentDismissingKeyguard(pi)

                    activityStarter.postStartActivityDismissingKeyguard(pi)

                }

            }

        })