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

Commit 9c3ed6e6 authored by Catherine Liang's avatar Catherine Liang Committed by Automerger Merge Worker
Browse files

Merge "Define flag for wallpaper preview loading animation (2/3)" into udc-qpr-dev am: c0f9ab57 

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



Change-Id: I55e25baa9fd8884611b2bbb717b5b8f7f75656a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 69484825 c0f9ab57

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

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

        const val FLAG_NAME_PAGE_TRANSITIONS = "wallpaper_picker_page_transitions"



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

        const val FLAG_NAME_WALLPAPER_PICKER_PREVIEW_ANIMATION =

            "wallpaper_picker_preview_animation"



        object Columns {

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

            const val NAME = "name"

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

+5 −1
Original line number Diff line number Diff line
@@ -412,7 +412,11 @@ constructor( 
            KeyguardPickerFlag(

                name = Contract.FlagsTable.FLAG_NAME_PAGE_TRANSITIONS,

                value = featureFlags.isEnabled(Flags.WALLPAPER_PICKER_PAGE_TRANSITIONS)

            )

            ),

            KeyguardPickerFlag(

                name = Contract.FlagsTable.FLAG_NAME_WALLPAPER_PICKER_PREVIEW_ANIMATION,

                value = featureFlags.isEnabled(Flags.WALLPAPER_PICKER_PREVIEW_ANIMATION)

            ),

        )

    }