Merge "Fix color logging crash" into main
diff --git a/src/com/android/customization/model/color/ColorOption.java b/src/com/android/customization/model/color/ColorOption.java
index 3035221..77fe404 100644
--- a/src/com/android/customization/model/color/ColorOption.java
+++ b/src/com/android/customization/model/color/ColorOption.java
@@ -112,6 +112,9 @@
if (seedColor == null || seedColor.isEmpty()) {
return ThemesUserEventLogger.NULL_SEED_COLOR;
}
+ if (!seedColor.startsWith("#")) {
+ seedColor = "#" + seedColor;
+ }
return Color.parseColor(seedColor);
}
diff --git a/tests/robotests/src/com/android/customization/model/picker/color/ui/viewmodel/ColorPickerViewModelTest.kt b/tests/robotests/src/com/android/customization/model/picker/color/ui/viewmodel/ColorPickerViewModelTest.kt
index c841267..6617582 100644
--- a/tests/robotests/src/com/android/customization/model/picker/color/ui/viewmodel/ColorPickerViewModelTest.kt
+++ b/tests/robotests/src/com/android/customization/model/picker/color/ui/viewmodel/ColorPickerViewModelTest.kt
@@ -130,7 +130,7 @@
repository.buildWallpaperOption(
ColorOptionsProvider.COLOR_SOURCE_LOCK,
Style.EXPRESSIVE,
- "#121212"
+ "121212"
)
),
listOf(repository.buildPresetOption(Style.FRUIT_SALAD, "#ABCDEF")),
@@ -161,7 +161,7 @@
repository.buildWallpaperOption(
ColorOptionsProvider.COLOR_SOURCE_LOCK,
Style.EXPRESSIVE,
- "#121212"
+ "121212"
)
),
listOf(repository.buildPresetOption(Style.FRUIT_SALAD, "#ABCDEF")),