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

Commit 33748d27 authored by Catherine Liang's avatar Catherine Liang
Browse files

Fix no color selected in picker on boot 

Make sure color string formatting matches picker so the correct color
is selected in the picker.

Bug: 404539643
Test: Manually verified
Flag: com.android.systemui.hardware_color_styles
Change-Id: Ide46e6658d832086f872cb084bb941e7f2f64a24
parent a54d13db

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

+3 −2
Original line number Diff line number Diff line
@@ -536,8 +536,9 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { 


            try {

                JSONObject object = new JSONObject(overlayPackageJson);

                String seedColorStr = Integer.toHexString(defaultSettings.seedColor.toArgb());

                if(defaultSettings.colorSource == COLOR_SOURCE_PRESET){

                int seedColor = defaultSettings.seedColor.toArgb();

                String seedColorStr = String.format("%06X", 0xFFFFFF & seedColor);

                if (Objects.equals(defaultSettings.colorSource, COLOR_SOURCE_PRESET)) {

                    object.put(OVERLAY_CATEGORY_SYSTEM_PALETTE, seedColorStr);

                    object.put(OVERLAY_CATEGORY_ACCENT_COLOR, seedColorStr);

                }