From 35586c062891e6f31c5124d8b1ab42c3477938e8 Mon Sep 17 00:00:00 2001 From: Santiago Etchebehere Date: Thu, 12 Jan 2023 20:47:16 -0800 Subject: [PATCH] Add a SysUI fag for WallpaperPicker full screen preview Bug: 242908637 Test: manually verified the right UI in the picker Change-Id: I49985dc26c925141e5f2c43fc59d83390d6a7dd3 --- .../data/content/CustomizationProviderContract.kt | 3 +++ packages/SystemUI/src/com/android/systemui/flags/Flags.kt | 5 +++++ .../domain/interactor/KeyguardQuickAffordanceInteractor.kt | 4 ++++ .../android/systemui/keyguard/CustomizationProviderTest.kt | 1 + 4 files changed, 13 insertions(+) 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 7f1c78fc47ff4..e4e9c4648f141 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 @@ -178,6 +178,9 @@ object CustomizationProviderContract { /** Flag denoting whether the customizable clocks feature is enabled. */ const val FLAG_NAME_CUSTOM_CLOCKS_ENABLED = "is_custom_clocks_feature_enabled" + /** Flag denoting whether the Wallpaper preview should use the full screen UI. */ + const val FLAG_NAME_WALLPAPER_FULLSCREEN_PREVIEW = "wallpaper_fullscreen_preview" + object Columns { /** String. Unique ID for the flag. */ const val NAME = "name" diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index 82934d10a9272..fa1a248177758 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -214,6 +214,11 @@ object Flags { val ENABLE_WALLET_CONTEXTUAL_LOYALTY_CARDS = unreleasedFlag(226, "enable_wallet_contextual_loyalty_cards", teamfood = false) + // TODO(b/242908637): Tracking Bug + @JvmField + val WALLPAPER_FULLSCREEN_PREVIEW = + unreleasedFlag(227, "wallpaper_fullscreen_preview", teamfood = true) + // 300 - power menu // TODO(b/254512600): Tracking Bug @JvmField val POWER_MENU_LITE = releasedFlag(300, "power_menu_lite") 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 c219380ad2638..9ddc575307b52 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 @@ -363,6 +363,10 @@ constructor( name = Contract.FlagsTable.FLAG_NAME_CUSTOM_CLOCKS_ENABLED, value = featureFlags.isEnabled(Flags.LOCKSCREEN_CUSTOM_CLOCKS), ), + KeyguardPickerFlag( + name = Contract.FlagsTable.FLAG_NAME_WALLPAPER_FULLSCREEN_PREVIEW, + value = featureFlags.isEnabled(Flags.WALLPAPER_FULLSCREEN_PREVIEW), + ), ) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt index 0a03b2c87f712..c0af0cb4089e7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt @@ -173,6 +173,7 @@ class CustomizationProviderTest : SysuiTestCase() { set(Flags.CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES, true) set(Flags.LOCKSCREEN_CUSTOM_CLOCKS, true) set(Flags.REVAMPED_WALLPAPER_UI, true) + set(Flags.WALLPAPER_FULLSCREEN_PREVIEW, true) }, repository = { quickAffordanceRepository }, launchAnimator = launchAnimator,