From fd31b08d9498e20a179200962ffdcfc8d00724b5 Mon Sep 17 00:00:00 2001 From: Catherine Liang Date: Tue, 11 Jul 2023 15:47:36 +0000 Subject: [PATCH] Define flag for wallpaper preview loading animation (2/3) This flag is owned in System UI and served to Wallpaper Picker (WPP) through the customization content provider. Bug: 274443705 Test: manually made sure that I can read the flag value in wallpaper picker and its value matches whatever I set the flag to. Change-Id: I4fa8e2bf238798be4f2ad87cf83fc65d78091e19 --- .../data/content/CustomizationProviderContract.kt | 4 ++++ .../domain/interactor/KeyguardQuickAffordanceInteractor.kt | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderContract.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderContract.kt index d43276c00f878..46f5971405df0 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderContract.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderContract.kt @@ -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" diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt index 40e0604ae1b34..a0a3fc5efaa69 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt @@ -413,7 +413,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) + ), ) }