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

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

Merge "Fix color logging crash" into main

parents e9be4d16 86c300e7

src/com/android/customization/model/color/ColorOption.java

+3 −0
Original line number Diff line number Diff line
@@ -112,6 +112,9 @@ public abstract class ColorOption implements CustomizationOption<ColorOption> { 
        if (seedColor == null || seedColor.isEmpty()) {

            return ThemesUserEventLogger.NULL_SEED_COLOR;

        }

        if (!seedColor.startsWith("#")) {

            seedColor = "#" + seedColor;

        }

        return Color.parseColor(seedColor);

    }

tests/robotests/src/com/android/customization/model/picker/color/ui/viewmodel/ColorPickerViewModelTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ class ColorPickerViewModelTest { 
                    repository.buildWallpaperOption(

                        ColorOptionsProvider.COLOR_SOURCE_LOCK,

                        Style.EXPRESSIVE,

                        "#121212"

                        "121212"

                    )

                ),

                listOf(repository.buildPresetOption(Style.FRUIT_SALAD, "#ABCDEF")),
@@ -161,7 +161,7 @@ class ColorPickerViewModelTest { 
                    repository.buildWallpaperOption(

                        ColorOptionsProvider.COLOR_SOURCE_LOCK,

                        Style.EXPRESSIVE,

                        "#121212"

                        "121212"

                    )

                ),

                listOf(repository.buildPresetOption(Style.FRUIT_SALAD, "#ABCDEF")),