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

Commit 8ff4b440 authored Jul 31, 2023 by Catherine Liang Committed by Automerger Merge Worker Jul 31, 2023

Merge "Define flag for wallpaper preview loading animation (2/3)" into...

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

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

Change-Id: I7bffcefa4ee09afba8de141bdf815f008d1d4c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 5a7fcbfc 9c3ed6e6

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)
		),
		)
		}