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

Merge "Device Controls - Supporting activity launch" into sc-qpr1-dev am: b6dfc45ca1 am: e00be48b5a

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

Change-Id: Idfb2128ad2d0dade3ac589c540483e19fcfaba47
This commit is contained in:
Matt Pietal
2021-09-16 17:16:17 +00:00
committed by Automerger Merge Worker
parent db72130e94 e00be48b5a
commit 553db7849e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt
View File

@@ -256,13 +256,13 @@ class ControlsUiControllerImpl @Inject constructor (
// Force animations when transitioning from a dialog to an activity // Force animations when transitioning from a dialog to an activity
intent.putExtra(ControlsUiController.EXTRA_ANIMATE, true) intent.putExtra(ControlsUiController.EXTRA_ANIMATE, true)
if (keyguardStateController.isUnlocked()) { if (keyguardStateController.isShowing()) {
activityStarter.postStartActivityDismissingKeyguard(intent, 0 /* delay */)
} else {
activityContext.startActivity( activityContext.startActivity(
intent, intent,
ActivityOptions.makeSceneTransitionAnimation(activityContext as Activity).toBundle() ActivityOptions.makeSceneTransitionAnimation(activityContext as Activity).toBundle()
) )
} else {
activityStarter.postStartActivityDismissingKeyguard(intent, 0 /* delay */)
} }
} }