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

Commit 18a164d8 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Enabling Monochromatic on droidfood" into tm-qpr-dev

parents 4514e31e 017b15d2

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

+3 −0
Original line number Diff line number Diff line
@@ -181,6 +181,9 @@ object CustomizationProviderContract { 
        /** Flag denoting whether the Wallpaper preview should use the full screen UI. */

        const val FLAG_NAME_WALLPAPER_FULLSCREEN_PREVIEW = "wallpaper_fullscreen_preview"



        /** Flag denoting whether the Monochromatic Theme is enabled. */

        const val FLAG_NAME_MONOCHROMATIC_THEME = "is_monochromatic_theme_enabled"



        object Columns {

            /** String. Unique ID for the flag. */

            const val NAME = "name"

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+1 −3
Original line number Diff line number Diff line
@@ -312,9 +312,7 @@ object Flags { 
    val SCREEN_CONTENTS_TRANSLATION = unreleasedFlag(803, "screen_contents_translation")



    // 804 - monochromatic themes

    @JvmField

    val MONOCHROMATIC_THEMES =

        sysPropBooleanFlag(804, "persist.sysui.monochromatic", default = false)

    @JvmField val MONOCHROMATIC_THEME = unreleasedFlag(804, "monochromatic", teamfood = true)



    // 900 - media

    // TODO(b/254512697): Tracking Bug

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

+4 −0
Original line number Diff line number Diff line
@@ -367,6 +367,10 @@ constructor( 
                name = Contract.FlagsTable.FLAG_NAME_WALLPAPER_FULLSCREEN_PREVIEW,

                value = featureFlags.isEnabled(Flags.WALLPAPER_FULLSCREEN_PREVIEW),

            ),

            KeyguardPickerFlag(

                name = Contract.FlagsTable.FLAG_NAME_MONOCHROMATIC_THEME,

                value = featureFlags.isEnabled(Flags.MONOCHROMATIC_THEME)

            )

        )

    }

packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { 
            @Main Resources resources,

            WakefulnessLifecycle wakefulnessLifecycle) {

        mContext = context;

        mIsMonochromaticEnabled = featureFlags.isEnabled(Flags.MONOCHROMATIC_THEMES);

        mIsMonochromaticEnabled = featureFlags.isEnabled(Flags.MONOCHROMATIC_THEME);

        mIsMonetEnabled = featureFlags.isEnabled(Flags.MONET);

        mDeviceProvisionedController = deviceProvisionedController;

        mBroadcastDispatcher = broadcastDispatcher;