Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a SysUI fag for WallpaperPicker full screen preview" into tm-qpr-dev am: 05d371d8e9

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

Change-Id: I238e5be48dbd7e1c05e34706c73c2c94d215134a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Santiago Etchebehere
2023-01-20 19:14:54 +00:00
committed by Automerger Merge Worker
parent 2c03baff94 05d371d8e9
commit 075c80a0d0
4 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,6 +178,9 @@ object CustomizationProviderContract {
/** Flag denoting whether the customizable clocks feature is enabled. */ /** Flag denoting whether the customizable clocks feature is enabled. */
const val FLAG_NAME_CUSTOM_CLOCKS_ENABLED = "is_custom_clocks_feature_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 { object Columns {
/** String. Unique ID for the flag. */ /** String. Unique ID for the flag. */
const val NAME = "name" const val NAME = "name"

5
packages/SystemUI/src/com/android/systemui/flags/Flags.kt
View File

@@ -216,6 +216,11 @@ object Flags {
val ENABLE_WALLET_CONTEXTUAL_LOYALTY_CARDS = val ENABLE_WALLET_CONTEXTUAL_LOYALTY_CARDS =
unreleasedFlag(226, "enable_wallet_contextual_loyalty_cards", teamfood = false) 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 // 300 - power menu
// TODO(b/254512600): Tracking Bug // TODO(b/254512600): Tracking Bug
@JvmField val POWER_MENU_LITE = releasedFlag(300, "power_menu_lite") @JvmField val POWER_MENU_LITE = releasedFlag(300, "power_menu_lite")

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

@@ -363,6 +363,10 @@ constructor(
name = Contract.FlagsTable.FLAG_NAME_CUSTOM_CLOCKS_ENABLED, name = Contract.FlagsTable.FLAG_NAME_CUSTOM_CLOCKS_ENABLED,
value = featureFlags.isEnabled(Flags.LOCKSCREEN_CUSTOM_CLOCKS), value = featureFlags.isEnabled(Flags.LOCKSCREEN_CUSTOM_CLOCKS),
), ),
KeyguardPickerFlag(
name = Contract.FlagsTable.FLAG_NAME_WALLPAPER_FULLSCREEN_PREVIEW,
value = featureFlags.isEnabled(Flags.WALLPAPER_FULLSCREEN_PREVIEW),
),
) )
} }

1
packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt
View File

@@ -173,6 +173,7 @@ class CustomizationProviderTest : SysuiTestCase() {
set(Flags.CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES, true) set(Flags.CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES, true)
set(Flags.LOCKSCREEN_CUSTOM_CLOCKS, true) set(Flags.LOCKSCREEN_CUSTOM_CLOCKS, true)
set(Flags.REVAMPED_WALLPAPER_UI, true) set(Flags.REVAMPED_WALLPAPER_UI, true)
set(Flags.WALLPAPER_FULLSCREEN_PREVIEW, true)
}, },
repository = { quickAffordanceRepository }, repository = { quickAffordanceRepository },
launchAnimator = launchAnimator, launchAnimator = launchAnimator,