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

Commit ea10d4f2 authored by Santiago Etchebehere's avatar Santiago Etchebehere Committed by Automerger Merge Worker
Browse files

Merge "Add a SysUI fag for WallpaperPicker full screen preview" into... 

Merge "Add a SysUI fag for WallpaperPicker full screen preview" into tm-qpr-dev am: 05d371d8 am: 075c80a0

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



Change-Id: I4750b1d376583afca0c571cbc0762911e66bdc27
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cebfc605 075c80a0

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

+3 −0
Original line number Diff line number Diff line
@@ -178,6 +178,9 @@ object CustomizationProviderContract { 
        /** Flag denoting whether the customizable clocks feature is enabled. */

        const val FLAG_NAME_CUSTOM_CLOCKS_ENABLED = "is_custom_clocks_feature_enabled"



        /** Flag denoting whether the Wallpaper preview should use the full screen UI. */

        const val FLAG_NAME_WALLPAPER_FULLSCREEN_PREVIEW = "wallpaper_fullscreen_preview"



        object Columns {

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

            const val NAME = "name"

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+5 −0
Original line number Diff line number Diff line
@@ -217,6 +217,11 @@ object Flags { 
    val ENABLE_WALLET_CONTEXTUAL_LOYALTY_CARDS =

        unreleasedFlag(226, "enable_wallet_contextual_loyalty_cards", teamfood = false)



    // TODO(b/242908637): Tracking Bug

    @JvmField

    val WALLPAPER_FULLSCREEN_PREVIEW =

        unreleasedFlag(227, "wallpaper_fullscreen_preview", teamfood = true)



    // 300 - power menu

    // TODO(b/254512600): Tracking Bug

    @JvmField val POWER_MENU_LITE = releasedFlag(300, "power_menu_lite")

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

+4 −0
Original line number Diff line number Diff line
@@ -363,6 +363,10 @@ constructor( 
                name = Contract.FlagsTable.FLAG_NAME_CUSTOM_CLOCKS_ENABLED,

                value = featureFlags.isEnabled(Flags.LOCKSCREEN_CUSTOM_CLOCKS),

            ),

            KeyguardPickerFlag(

                name = Contract.FlagsTable.FLAG_NAME_WALLPAPER_FULLSCREEN_PREVIEW,

                value = featureFlags.isEnabled(Flags.WALLPAPER_FULLSCREEN_PREVIEW),

            ),

        )

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ class CustomizationProviderTest : SysuiTestCase() { 
                        set(Flags.CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES, true)

                        set(Flags.LOCKSCREEN_CUSTOM_CLOCKS, true)

                        set(Flags.REVAMPED_WALLPAPER_UI, true)

                        set(Flags.WALLPAPER_FULLSCREEN_PREVIEW, true)

                    },

                repository = { quickAffordanceRepository },

                launchAnimator = launchAnimator,