diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-10 00:19:46 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-10 00:19:46 +0000 |
| commit | 3e8d186b26cea04ba0b520d94b0d1b7a4e5663aa (patch) | |
| tree | fcc52f5816188796bde371d3a9400a80f6a0d336 | |
| parent | 4fd6cec3f8617b872569066cb237bdbce4b2ebd7 (diff) | |
| parent | 4a06fae71edbd09fb3c0ee3de76392cdaffbd5f5 (diff) | |
| download | ThemePicker-3e8d186b26cea04ba0b520d94b0d1b7a4e5663aa.tar.gz | |
Snap for 11078623 from 4a06fae71edbd09fb3c0ee3de76392cdaffbd5f5 to 24Q1-release
Change-Id: I30d6ed6502d85a6259044f2187bd76c440cf03ce
| -rw-r--r-- | src/com/android/customization/model/color/ColorOption.java | 3 | ||||
| -rw-r--r-- | tests/robotests/src/com/android/customization/model/picker/color/ui/viewmodel/ColorPickerViewModelTest.kt | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/customization/model/color/ColorOption.java b/src/com/android/customization/model/color/ColorOption.java index 30352217..77fe4044 100644 --- a/src/com/android/customization/model/color/ColorOption.java +++ b/src/com/android/customization/model/color/ColorOption.java @@ -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); } 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 c8412672..66175828 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 @@ 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")), |