Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ale Nijamkin
2022-12-15 18:34:45 +00:00
committed by Android (Google) Code Review
parent 49fedfb025 20e55efa61
commit 683736d836
4 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values/config.xml
View File

@@ -820,6 +820,8 @@
slot. If the user did make a choice, even if the choice is the "None" option, the default is slot. If the user did make a choice, even if the choice is the "None" option, the default is
ignored. --> ignored. -->
<string-array name="config_keyguardQuickAffordanceDefaults" translatable="false"> <string-array name="config_keyguardQuickAffordanceDefaults" translatable="false">
<item>bottom_start:home</item>
<item>bottom_end:wallet</item>
</string-array> </string-array>
</resources> </resources>

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

@@ -165,6 +165,10 @@ class KeyguardQuickAffordanceLocalUserSelectionManagerTest : SysuiTestCase() {
@Test @Test
fun `remembers selections by user`() = runTest { fun `remembers selections by user`() = runTest {
overrideResource(
R.array.config_keyguardQuickAffordanceDefaults,
arrayOf<String>(),
)
val slot1 = "slot_1" val slot1 = "slot_1"
val slot2 = "slot_2" val slot2 = "slot_2"
val affordance1 = "affordance_1" val affordance1 = "affordance_1"

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

@@ -114,6 +114,11 @@ class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() {
userHandle = UserHandle.SYSTEM, userHandle = UserHandle.SYSTEM,
) )
overrideResource(
R.array.config_keyguardQuickAffordanceDefaults,
arrayOf<String>(),
)
underTest = underTest =
KeyguardQuickAffordanceRepository( KeyguardQuickAffordanceRepository(
appContext = context, appContext = context,

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

@@ -20,6 +20,7 @@ package com.android.systemui.keyguard.domain.interactor
import android.os.UserHandle import android.os.UserHandle
import androidx.test.filters.SmallTest import androidx.test.filters.SmallTest
import com.android.internal.widget.LockPatternUtils import com.android.internal.widget.LockPatternUtils
import com.android.systemui.R
import com.android.systemui.SysuiTestCase import com.android.systemui.SysuiTestCase
import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.ContentDescription
import com.android.systemui.common.shared.model.Icon import com.android.systemui.common.shared.model.Icon
@@ -290,6 +291,11 @@ class KeyguardQuickAffordanceInteractorTest : SysuiTestCase() {
@Test @Test
fun select() = fun select() =
testScope.runTest { testScope.runTest {
overrideResource(
R.array.config_keyguardQuickAffordanceDefaults,
arrayOf<String>(),
)
featureFlags.set(Flags.CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES, true) featureFlags.set(Flags.CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES, true)
homeControls.setState( homeControls.setState(
KeyguardQuickAffordanceConfig.LockScreenState.Visible(icon = ICON) KeyguardQuickAffordanceConfig.LockScreenState.Visible(icon = ICON)