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

Commit d40db3fc authored by Catherine Liang's avatar Catherine Liang Committed by Android (Google) Code Review
Browse files

Merge "Fix color picker flagging" into main

parents 2ccac2e7 d8c08d1d

src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionViewUtil.kt

+2 −1
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ constructor( 
                layoutInflater = layoutInflater,

            )

        val isComposeRefactorEnabled = BaseFlags.get().isComposeRefactorEnabled()

        val isColorPickerUpdateEnabled = BaseFlags.get().isColorPickerUpdateEnabled()

        val isKeyguardQuickAffordanceEnabled =

            BaseFlags.get().isKeyguardQuickAffordanceEnabled(bottomSheetContainer.context)

        return buildMap {
@@ -234,7 +235,7 @@ constructor( 


            put(

                COLORS,

                if (isComposeRefactorEnabled) {

                if (isColorPickerUpdateEnabled) {

                        ComposeView(context).apply { setContent { ColorFloatingSheet() } }

                    } else {

                        inflateFloatingSheet(COLORS, bottomSheetContainer, layoutInflater)