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

Commit 0f1f7944 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix color preview icons in custom theme" into ub-launcher3-master

parents 38675745 74a1a683

src/com/android/customization/model/theme/custom/ColorOptionsProvider.java

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.android.customization.model.ResourceConstants.ACCENT_COLOR_LIG 
import static com.android.customization.model.ResourceConstants.ANDROID_PACKAGE;

import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_ANDROID_THEME;

import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_COLOR;

import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_ICON_ANDROID;

import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_ICON_SYSUI;

import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_SHAPE;

import static com.android.customization.model.ResourceConstants.PATH_SIZE;
@@ -73,7 +74,7 @@ public class ColorOptionsProvider extends ThemeComponentOptionProvider<ColorOpti 
    protected void loadOptions() {

        List<Drawable> previewIcons = new ArrayList<>();

        String iconPackage =

                mCustomThemeManager.getOverlayPackages().get(OVERLAY_CATEGORY_ICON_SYSUI);

                mCustomThemeManager.getOverlayPackages().get(OVERLAY_CATEGORY_ICON_ANDROID);

        if (TextUtils.isEmpty(iconPackage)) {

            iconPackage = SYSUI_PACKAGE;

        }