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

Commit 615cf195 authored by Fengjiang Li's avatar Fengjiang Li Committed by Android (Google) Code Review
Browse files

Merge "Add WALLPAPER_PICKER_GRID_APPLY_BUTTON to SysUi Flags.kt" into udc-qpr-dev

parents 776e8d05 eb7b1d24

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -190,6 +190,9 @@ object CustomizationProviderContract { 
        /** Flag denoting transit clock are enabled in wallpaper picker. */

        /** Flag denoting transit clock are enabled in wallpaper picker. */

        const val FLAG_NAME_PAGE_TRANSITIONS = "wallpaper_picker_page_transitions"

        const val FLAG_NAME_PAGE_TRANSITIONS = "wallpaper_picker_page_transitions"





        /** Flag denoting adding apply button to wallpaper picker's grid preview page. */

        const val FLAG_NAME_GRID_APPLY_BUTTON = "wallpaper_picker_grid_apply_button"



        /** Flag denoting whether preview loading animation is enabled. */

        /** Flag denoting whether preview loading animation is enabled. */

        const val FLAG_NAME_WALLPAPER_PICKER_PREVIEW_ANIMATION =

        const val FLAG_NAME_WALLPAPER_PICKER_PREVIEW_ANIMATION =

            "wallpaper_picker_preview_animation"

            "wallpaper_picker_preview_animation"

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -229,6 +229,12 @@ object Flags { 
    val WALLPAPER_PICKER_PAGE_TRANSITIONS =

    val WALLPAPER_PICKER_PAGE_TRANSITIONS =

        unreleasedFlag(291710220, "wallpaper_picker_page_transitions")

        unreleasedFlag(291710220, "wallpaper_picker_page_transitions")





    /** Add "Apply" button to wall paper picker's grid preview page. */

    // TODO(b/294866904): Tracking bug.

    @JvmField

    val WALLPAPER_PICKER_GRID_APPLY_BUTTON =

            unreleasedFlag(294866904, "wallpaper_picker_grid_apply_button")



    /** Whether to run the new udfps keyguard refactor code. */

    /** Whether to run the new udfps keyguard refactor code. */

    // TODO(b/279440316): Tracking bug.

    // TODO(b/279440316): Tracking bug.

    @JvmField

    @JvmField