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

Commit 832d7e37 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Fix accent color not being applied" into sc-dev

parents 4e14c357 e29458f1

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

+5 −2
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ public class ThemeOverlayApplier implements Dumpable { 
     */

    static final List<String> THEME_CATEGORIES = Lists.newArrayList(

            OVERLAY_CATEGORY_SYSTEM_PALETTE,

            OVERLAY_CATEGORY_NEUTRAL_PALETTE,

            OVERLAY_CATEGORY_ICON_LAUNCHER,

            OVERLAY_CATEGORY_SHAPE,

            OVERLAY_CATEGORY_FONT,
@@ -107,6 +108,7 @@ public class ThemeOverlayApplier implements Dumpable { 
    @VisibleForTesting

    static final Set<String> SYSTEM_USER_CATEGORIES = Sets.newHashSet(

            OVERLAY_CATEGORY_SYSTEM_PALETTE,

            OVERLAY_CATEGORY_NEUTRAL_PALETTE,

            OVERLAY_CATEGORY_ACCENT_COLOR,

            OVERLAY_CATEGORY_FONT,

            OVERLAY_CATEGORY_SHAPE,
@@ -129,8 +131,9 @@ public class ThemeOverlayApplier implements Dumpable { 
        mLauncherPackage = launcherPackage;

        mThemePickerPackage = themePickerPackage;

        mTargetPackageToCategories.put(ANDROID_PACKAGE, Sets.newHashSet(

                OVERLAY_CATEGORY_SYSTEM_PALETTE, OVERLAY_CATEGORY_ACCENT_COLOR,

                OVERLAY_CATEGORY_FONT, OVERLAY_CATEGORY_SHAPE, OVERLAY_CATEGORY_ICON_ANDROID));

                OVERLAY_CATEGORY_SYSTEM_PALETTE, OVERLAY_CATEGORY_NEUTRAL_PALETTE,

                OVERLAY_CATEGORY_ACCENT_COLOR, OVERLAY_CATEGORY_FONT, OVERLAY_CATEGORY_SHAPE,

                OVERLAY_CATEGORY_ICON_ANDROID));

        mTargetPackageToCategories.put(SYSUI_PACKAGE,

                Sets.newHashSet(OVERLAY_CATEGORY_ICON_SYSUI));

        mTargetPackageToCategories.put(SETTINGS_PACKAGE,

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

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable { 


    protected static final int PRIMARY = 0;

    protected static final int SECONDARY = 1;

    protected static final int NEUTRAL = 1;

    protected static final int NEUTRAL = 2;



    // If lock screen wallpaper colors should also be considered when selecting the theme.

    // Doing this has performance impact, given that overlays would need to be swapped when

packages/SystemUI/tests/src/com/android/systemui/theme/ThemeOverlayApplierTest.java

+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_CATEGORY_IC 
import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_CATEGORY_ICON_SETTINGS;

import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_CATEGORY_ICON_SYSUI;

import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_CATEGORY_ICON_THEME_PICKER;

import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_CATEGORY_NEUTRAL_PALETTE;

import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_CATEGORY_SHAPE;

import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_CATEGORY_SYSTEM_PALETTE;

import static com.android.systemui.theme.ThemeOverlayApplier.SETTINGS_PACKAGE;
@@ -114,6 +115,8 @@ public class ThemeOverlayApplierTest extends SysuiTestCase { 
                                ANDROID_PACKAGE, OVERLAY_CATEGORY_ACCENT_COLOR, false),

                        createOverlayInfo(TEST_DISABLED_PREFIX + OVERLAY_CATEGORY_SYSTEM_PALETTE,

                                ANDROID_PACKAGE, OVERLAY_CATEGORY_SYSTEM_PALETTE, false),

                        createOverlayInfo(TEST_DISABLED_PREFIX + OVERLAY_CATEGORY_NEUTRAL_PALETTE,

                                ANDROID_PACKAGE, OVERLAY_CATEGORY_NEUTRAL_PALETTE, false),

                        createOverlayInfo(TEST_DISABLED_PREFIX + OVERLAY_CATEGORY_FONT,

                                ANDROID_PACKAGE, OVERLAY_CATEGORY_FONT, false),

                        createOverlayInfo(TEST_DISABLED_PREFIX + OVERLAY_CATEGORY_SHAPE,
@@ -124,6 +127,8 @@ public class ThemeOverlayApplierTest extends SysuiTestCase { 
                                ANDROID_PACKAGE, OVERLAY_CATEGORY_ACCENT_COLOR, true),

                        createOverlayInfo(TEST_ENABLED_PREFIX + OVERLAY_CATEGORY_SYSTEM_PALETTE,

                                ANDROID_PACKAGE, OVERLAY_CATEGORY_SYSTEM_PALETTE, true),

                        createOverlayInfo(TEST_ENABLED_PREFIX + OVERLAY_CATEGORY_NEUTRAL_PALETTE,

                                ANDROID_PACKAGE, OVERLAY_CATEGORY_NEUTRAL_PALETTE, true),

                        createOverlayInfo(TEST_ENABLED_PREFIX + OVERLAY_CATEGORY_FONT,

                                ANDROID_PACKAGE, OVERLAY_CATEGORY_FONT, true),

                        createOverlayInfo(TEST_ENABLED_PREFIX + OVERLAY_CATEGORY_SHAPE,