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

Commit 683736d8 authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Android (Google) Code Review
Browse files

Merge "Defines default quick affordances." into tm-qpr-dev

parents 49fedfb0 20e55efa

packages/SystemUI/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -820,6 +820,8 @@ 
    slot. If the user did make a choice, even if the choice is the "None" option, the default is

    ignored. -->

    <string-array name="config_keyguardQuickAffordanceDefaults" translatable="false">

        <item>bottom_start:home</item>

        <item>bottom_end:wallet</item>

    </string-array>



</resources>

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

+4 −0
Original line number Diff line number Diff line
@@ -165,6 +165,10 @@ class KeyguardQuickAffordanceLocalUserSelectionManagerTest : SysuiTestCase() { 


    @Test

    fun `remembers selections by user`() = runTest {

        overrideResource(

            R.array.config_keyguardQuickAffordanceDefaults,

            arrayOf<String>(),

        )

        val slot1 = "slot_1"

        val slot2 = "slot_2"

        val affordance1 = "affordance_1"

packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt

+5 −0
Original line number Diff line number Diff line
@@ -114,6 +114,11 @@ class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() { 
                userHandle = UserHandle.SYSTEM,

            )



        overrideResource(

            R.array.config_keyguardQuickAffordanceDefaults,

            arrayOf<String>(),

        )



        underTest =

            KeyguardQuickAffordanceRepository(

                appContext = context,

packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ package com.android.systemui.keyguard.domain.interactor 
import android.os.UserHandle

import androidx.test.filters.SmallTest

import com.android.internal.widget.LockPatternUtils

import com.android.systemui.R

import com.android.systemui.SysuiTestCase

import com.android.systemui.common.shared.model.ContentDescription

import com.android.systemui.common.shared.model.Icon
@@ -290,6 +291,11 @@ class KeyguardQuickAffordanceInteractorTest : SysuiTestCase() { 
    @Test

    fun select() =

        testScope.runTest {

            overrideResource(

                R.array.config_keyguardQuickAffordanceDefaults,

                arrayOf<String>(),

            )



            featureFlags.set(Flags.CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES, true)

            homeControls.setState(

                KeyguardQuickAffordanceConfig.LockScreenState.Visible(icon = ICON)