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

Commit 1818a527 authored by Bhavuk Jain's avatar Bhavuk Jain Committed by Automerger Merge Worker
Browse files

Merge "Added flags for AI Wallpapers in WallpaperPicker" into tm-qpr-dev am:... 

Merge "Added flags for AI Wallpapers in WallpaperPicker" into tm-qpr-dev am: 4862211f am: f0dff403 am: 551337c5

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



Change-Id: I04970d2363d93fd6facd8cdad4b3f0b8e01f034e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7a002a78 551337c5

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

+3 −0
Original line number Diff line number Diff line
@@ -184,6 +184,9 @@ object CustomizationProviderContract { 
        /** Flag denoting whether the Monochromatic Theme is enabled. */

        const val FLAG_NAME_MONOCHROMATIC_THEME = "is_monochromatic_theme_enabled"



        /** Flag denoting AI Wallpapers are enabled in wallpaper picker. */

        const val FLAG_NAME_WALLPAPER_PICKER_UI_FOR_AIWP = "wallpaper_picker_ui_for_aiwp"



        object Columns {

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

            const val NAME = "name"

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

+9 −0
Original line number Diff line number Diff line
@@ -220,6 +220,15 @@ object Flags { 
            "lock_screen_long_press_enabled"

        )



    /** Enables UI updates for AI wallpapers in the wallpaper picker. */

    // TODO(b/267722622): Tracking Bug

    @JvmField

    val WALLPAPER_PICKER_UI_FOR_AIWP =

            releasedFlag(

                    229,

                    "wallpaper_picker_ui_for_aiwp"

            )



    /** Whether to inflate the bouncer view on a background thread. */

    // TODO(b/272091103): Tracking Bug

    @JvmField

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

+4 −0
Original line number Diff line number Diff line
@@ -414,6 +414,10 @@ constructor( 
            KeyguardPickerFlag(

                name = Contract.FlagsTable.FLAG_NAME_MONOCHROMATIC_THEME,

                value = featureFlags.isEnabled(Flags.MONOCHROMATIC_THEME)

            ),

            KeyguardPickerFlag(

                name = Contract.FlagsTable.FLAG_NAME_WALLPAPER_PICKER_UI_FOR_AIWP,

                value = featureFlags.isEnabled(Flags.WALLPAPER_PICKER_UI_FOR_AIWP)

            )

        )

    }