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

Commit 63870eaf authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge changes from topic "wp-page-transitions-flag" into udc-qpr-dev 

* changes:
  Add WALLPAPER_PICKER_PAGE_TRANSITIONS flag (2)
  Add WALLPAPER_PICKER_PAGE_TRANSITIONS flag (1)
parents afb88164 4db7f984

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

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

        const val FLAG_NAME_TRANSIT_CLOCK = "lockscreen_custom_transit_clock"



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

        const val FLAG_NAME_PAGE_TRANSITIONS = "wallpaper_picker_page_transitions"



        object Columns {

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

            const val NAME = "name"

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

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

        unreleasedFlag(232, "lock_screen_long_press_directly_opens_wallpaper_picker")



    /** Whether page transition animations in the wallpaper picker are enabled */

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

    @JvmField

    val WALLPAPER_PICKER_PAGE_TRANSITIONS =

        unreleasedFlag(291710220, "wallpaper_picker_page_transitions")



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

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

    @JvmField

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

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

                name = Contract.FlagsTable.FLAG_NAME_TRANSIT_CLOCK,

                value = featureFlags.isEnabled(Flags.TRANSIT_CLOCK)

            ),

            KeyguardPickerFlag(

                name = Contract.FlagsTable.FLAG_NAME_PAGE_TRANSITIONS,

                value = featureFlags.isEnabled(Flags.WALLPAPER_PICKER_PAGE_TRANSITIONS)

            )

        )

    }