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

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

Merge "Links WPP clocks flag to SysUI's flag (3/3)." into tm-qpr-dev

parents 7ade0ddd 7b93c03e

packages/SystemUI/customization/src/com/android/systemui/shared/quickaffordance/data/content/FakeKeyguardQuickAffordanceProviderClient.kt

+3 −1
Original line number Diff line number Diff line
@@ -58,7 +58,9 @@ class FakeKeyguardQuickAffordanceProviderClient( 
    flags: List<KeyguardQuickAffordanceProviderClient.Flag> =

        listOf(

            KeyguardQuickAffordanceProviderClient.Flag(

                name = KeyguardQuickAffordanceProviderContract.FlagsTable.FLAG_NAME_FEATURE_ENABLED,

                name =

                    KeyguardQuickAffordanceProviderContract.FlagsTable

                        .FLAG_NAME_CUSTOM_LOCK_SCREEN_QUICK_AFFORDANCES_ENABLED,

                value = true,

            )

        ),

packages/SystemUI/customization/src/com/android/systemui/shared/quickaffordance/data/content/KeyguardQuickAffordanceProviderContract.kt

+5 −1
Original line number Diff line number Diff line
@@ -148,7 +148,11 @@ object KeyguardQuickAffordanceProviderContract { 
        /**

         * Flag denoting whether the customizable lock screen quick affordances feature is enabled.

         */

        const val FLAG_NAME_FEATURE_ENABLED = "is_feature_enabled"

        const val FLAG_NAME_CUSTOM_LOCK_SCREEN_QUICK_AFFORDANCES_ENABLED =

            "is_custom_lock_screen_quick_affordances_feature_enabled"



        /** Flag denoting whether the customizable clocks feature is enabled. */

        const val FLAG_NAME_CUSTOM_CLOCKS_ENABLED = "is_custom_clocks_feature_enabled"



        object Columns {

            /** String. Unique ID for the flag. */

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

+7 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardSlotPickerRepresentati 
import com.android.systemui.keyguard.shared.quickaffordance.KeyguardQuickAffordancePosition

import com.android.systemui.plugins.ActivityStarter

import com.android.systemui.settings.UserTracker

import com.android.systemui.shared.quickaffordance.data.content.KeyguardQuickAffordanceProviderContract

import com.android.systemui.shared.quickaffordance.data.content.KeyguardQuickAffordanceProviderContract as Contract

import com.android.systemui.statusbar.policy.KeyguardStateController

import dagger.Lazy

import javax.inject.Inject
@@ -333,9 +333,13 @@ constructor( 
    fun getPickerFlags(): List<KeyguardPickerFlag> {

        return listOf(

            KeyguardPickerFlag(

                name = KeyguardQuickAffordanceProviderContract.FlagsTable.FLAG_NAME_FEATURE_ENABLED,

                name = Contract.FlagsTable.FLAG_NAME_CUSTOM_LOCK_SCREEN_QUICK_AFFORDANCES_ENABLED,

                value = featureFlags.isEnabled(Flags.CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES),

            )

            ),

            KeyguardPickerFlag(

                name = Contract.FlagsTable.FLAG_NAME_CUSTOM_CLOCKS_ENABLED,

                value = featureFlags.isEnabled(Flags.LOCKSCREEN_CUSTOM_CLOCKS),

            ),

        )

    }

packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardQuickAffordanceProviderTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ class KeyguardQuickAffordanceProviderTest : SysuiTestCase() { 
                featureFlags =

                    FakeFeatureFlags().apply {

                        set(Flags.CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES, true)

                        set(Flags.LOCKSCREEN_CUSTOM_CLOCKS, true)

                    },

                repository = { quickAffordanceRepository },

            )