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

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

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

Change-Id: I55c3fd1fac711b44832553bc2c62655bacfdfa04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Xiaowen Lei
2022-11-15 17:26:46 +00:00
committed by Automerger Merge Worker
parent b1c5023d7a eed2d8f0bc
commit ec8a20402c
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,19 +234,24 @@ class LockscreenSmartspaceController @Inject constructor(
ssView.setIntentStarter(object : BcSmartspaceDataPlugin.IntentStarter {
override fun startIntent(view: View, intent: Intent, showOnLockscreen: Boolean) {
activityStarter.startActivity(
intent,
true, /* dismissShade */
null, /* launch animator - looks bad with the transparent smartspace bg */
showOnLockscreen
)
if (showOnLockscreen) {
activityStarter.startActivity(
intent,
true, /* dismissShade */
// 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)
}
}
})