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

Commit c4b67799 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Automerger Merge Worker
Browse files

Merge changes from topic "wp-page-transitions-flag" into udc-qpr-dev am: 63870eaf 

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



Change-Id: I87d2d5ed44d410b1a6f88101736cb119f5dec018
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0f6d9298 63870eaf

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

+3 −0
Original line number Diff line number Diff line
@@ -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"

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

+4 −0
Original line number Diff line number Diff line
@@ -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)

            )

        )

    }