From e607c8ac624e1e41862c69cdf15ca471d0871d2b Mon Sep 17 00:00:00 2001 From: Johannes Gallmann Date: Thu, 20 Jul 2023 10:24:40 +0200 Subject: [PATCH 1/2] Add WALLPAPER_PICKER_PAGE_TRANSITIONS flag (1) Bug: 278929581 Flag: WALLPAPER_PICKER_PAGE_TRANSITIONS Test: Presubmit, local build Change-Id: I9bbae476783c9872fb79c28c9a8a62d5667a0dd0 --- packages/SystemUI/src/com/android/systemui/flags/Flags.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index 0670ec3808619..04246dce5f500 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -232,6 +232,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 From 4db7f9847e4478b1db96da63e76ba7e3aaa15754 Mon Sep 17 00:00:00 2001 From: Johannes Gallmann Date: Thu, 20 Jul 2023 10:24:51 +0200 Subject: [PATCH 2/2] Add WALLPAPER_PICKER_PAGE_TRANSITIONS flag (2) Bug: 278929581 Flag: WALLPAPER_PICKER_PAGE_TRANSITIONS Test: Presubmit, local build Change-Id: Iccb4f40c79d2ea02f1bcb2b1bf496dc032253fbd --- .../data/content/CustomizationProviderContract.kt | 3 +++ .../domain/interactor/KeyguardQuickAffordanceInteractor.kt | 4 ++++ 2 files changed, 7 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 95a9ce960dcdf..d43276c00f878 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 @@ -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" 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 324d443d974da..40e0604ae1b34 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 @@ -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) ) ) }