diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 4cda8c7b53284..0fe93e3328b07 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -824,6 +824,8 @@ slot. If the user did make a choice, even if the choice is the "None" option, the default is ignored. --> + bottom_start:home + bottom_end:wallet diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManagerTest.kt index 67091a9f40c76..3d6571349a3ef 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManagerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManagerTest.kt @@ -165,6 +165,10 @@ class KeyguardQuickAffordanceLocalUserSelectionManagerTest : SysuiTestCase() { @Test fun `remembers selections by user`() = runTest { + overrideResource( + R.array.config_keyguardQuickAffordanceDefaults, + arrayOf(), + ) val slot1 = "slot_1" val slot2 = "slot_2" val affordance1 = "affordance_1" diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt index c40488adf0298..c187a3ff63bd0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt @@ -114,6 +114,11 @@ class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() { userHandle = UserHandle.SYSTEM, ) + overrideResource( + R.array.config_keyguardQuickAffordanceDefaults, + arrayOf(), + ) + underTest = KeyguardQuickAffordanceRepository( appContext = context, diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt index d97571bcd8ef8..58a85306eb690 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt @@ -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(), + ) + featureFlags.set(Flags.CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES, true) homeControls.setState( KeyguardQuickAffordanceConfig.LockScreenState.Visible(icon = ICON)