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

Commit 29053db6 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Automerger Merge Worker
Browse files

Merge "Revert "Add WALLPAPER_PICKER_GRID_APPLY_BUTTON to SysUi Flags.kt"" into... 

Merge "Revert "Add WALLPAPER_PICKER_GRID_APPLY_BUTTON to SysUi Flags.kt"" into udc-qpr-dev am: dea4d8e3

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



Change-Id: I8fcb314566e3fd40c1c00faf5f9522437e9afc90
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b0aacb2 dea4d8e3

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

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

        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. */

        const val FLAG_NAME_WALLPAPER_PICKER_PREVIEW_ANIMATION =

            "wallpaper_picker_preview_animation"

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

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

        unreleasedFlag("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("wallpaper_picker_grid_apply_button")



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

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

    @JvmField