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

Commit 21f91f5d authored by Brad Hinegardner's avatar Brad Hinegardner Committed by Automerger Merge Worker
Browse files

Merge "Align lockscreen state and picker state for Device Controls shortcut"... 

Merge "Align lockscreen state and picker state for Device Controls shortcut" into udc-qpr-dev am: cb9ba144

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



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

packages/SystemUI/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -3081,7 +3081,7 @@ 
    configured. This is shown as part of a dialog that explains to the user why they cannot select

    this shortcut for their lock screen right now. [CHAR LIMIT=NONE].

    -->

    <string name="home_quick_affordance_unavailable_configure_the_app">&#8226; At least one device is available</string>

    <string name="home_quick_affordance_unavailable_configure_the_app">&#8226; At least one device or device panel are available</string>



    <!---

    Explains that the notes app is not available. This is shown as part of a dialog that explains to

packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/HomeControlsKeyguardQuickAffordanceConfig.kt

+3 −2
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ constructor( 
            component.getControlsListingController().getOrNull()?.getCurrentServices()

        val hasFavorites =

            component.getControlsController().getOrNull()?.getFavorites()?.isNotEmpty() == true

        val hasPanels = currentServices?.any { it.panelActivity != null } == true

        val componentPackageName = component.getPackageName()

        when {

            currentServices.isNullOrEmpty() && !componentPackageName.isNullOrEmpty() -> {
@@ -100,8 +101,8 @@ constructor( 
                        ),

                )

            }

            !hasFavorites -> {

                // Home app installed but no favorites selected.

            !hasFavorites && !hasPanels -> {

                // Home app installed but no favorites selected or panel activities available.

                val activityClass = component.getControlsUiController().get().resolveActivity()

                return disabledPickerState(

                    explanation =

packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/HomeControlsKeyguardQuickAffordanceConfigParameterizedStateTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ class HomeControlsKeyguardQuickAffordanceConfigParameterizedStateTest : SysuiTes 
                    !isFeatureEnabled ->

                        KeyguardQuickAffordanceConfig.PickerScreenState.UnavailableOnDevice::class

                            .java

                    hasServiceInfos && hasFavorites ->

                    hasServiceInfos && (hasFavorites || hasPanels) ->

                        KeyguardQuickAffordanceConfig.PickerScreenState.Default::class.java

                    else -> KeyguardQuickAffordanceConfig.PickerScreenState.Disabled::class.java

                }