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

Commit 553db784 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Device Controls - Supporting activity launch" into sc-qpr1-dev am: b6dfc45c am: e00be48b 

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

Change-Id: Idfb2128ad2d0dade3ac589c540483e19fcfaba47
parents db72130e e00be48b

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

+3 −3
Original line number Diff line number Diff line
@@ -256,13 +256,13 @@ class ControlsUiControllerImpl @Inject constructor ( 
        // Force animations when transitioning from a dialog to an activity

        intent.putExtra(ControlsUiController.EXTRA_ANIMATE, true)



        if (keyguardStateController.isUnlocked()) {

        if (keyguardStateController.isShowing()) {

            activityStarter.postStartActivityDismissingKeyguard(intent, 0 /* delay */)

        } else {

            activityContext.startActivity(

                intent,

                ActivityOptions.makeSceneTransitionAnimation(activityContext as Activity).toBundle()

            )

        } else {

            activityStarter.postStartActivityDismissingKeyguard(intent, 0 /* delay */)

        }

    }