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

Commit 1cc17921 authored by Matt Pietal's avatar Matt Pietal
Browse files

Device Controls - Supporting activity launch 

Make sure to dismiss the keyguard prior to launching supporting
activities. Otherwise the keyguard will remain and leave the user in
a loop of trying to add/edit controls without the means to do so.

Fixes: 199882607
Test: manual - swipe security, attempt to "Add Controls" from lockscreen
Change-Id: Ic157d91004af68b191a62124726bfdbb54ca9ac9
parent b60eafbd

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 */)

        }

    }