Merge branch '4634-R-Disable_multiple_color_choose_for_custom_theme' into 'v1-r'

        }

        Drawable shape = loadShape(shapePackage);

        addDefault(previewIcons, shape);

        for (String overlayPackage : mOverlayPackages) {

            try {

                Resources overlayRes = getOverlayResources(overlayPackage);

                int lightColor = overlayRes.getColor(

                        overlayRes.getIdentifier(ACCENT_COLOR_LIGHT_NAME, "color", overlayPackage),

                        null);

                int darkColor = overlayRes.getColor(

                        overlayRes.getIdentifier(ACCENT_COLOR_DARK_NAME, "color", overlayPackage),

                        null);

                PackageManager pm = mContext.getPackageManager();

                String label = pm.getApplicationInfo(overlayPackage, 0).loadLabel(pm).toString();

                ColorOption option = new ColorOption(overlayPackage, label, lightColor, darkColor);

                option.setPreviewIcons(previewIcons);

                option.setShapeDrawable(shape);

                mOptions.add(option);

            } catch (NameNotFoundException | NotFoundException e) {

                Log.w(TAG, String.format("Couldn't load color overlay %s, will skip it",

                        overlayPackage), e);

            }

        }

    }

    private void addDefault(List<Drawable> previewIcons, Drawable shape) {