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

Commit 234ae2d8 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Do not ignore forceReload requests" into tm-dev am: 8ed3ef0f am: f3c5eaae 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17988792



Change-Id: Icc690218bf03f769cb675bccbf56f4a9a71dc39c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b65d007c f3c5eaae

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

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ public class ThemeOverlayController extends CoreStartable implements Dumpable { 
            mThemeStyle = fetchThemeStyleFromSetting();

            mSecondaryOverlay = getOverlay(mMainWallpaperColor, ACCENT, mThemeStyle);

            mNeutralOverlay = getOverlay(mMainWallpaperColor, NEUTRAL, mThemeStyle);

            if (colorSchemeIsApplied()) {

            if (colorSchemeIsApplied() && !forceReload) {

                Log.d(TAG, "Skipping overlay creation. Theme was already: " + mColorScheme);

                return;

            }

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

+12 −0
Original line number Diff line number Diff line
@@ -729,6 +729,18 @@ public class ThemeOverlayControllerTest extends SysuiTestCase { 
        mColorsListener.getValue().onColorsChanged(mainColors, WallpaperManager.FLAG_SYSTEM,

                USER_SYSTEM);



        reset(mResources);

        when(mResources.getColor(eq(android.R.color.system_accent1_500), any()))

                .thenReturn(mThemeOverlayController.mColorScheme.getAccent1().get(6));

        when(mResources.getColor(eq(android.R.color.system_accent2_500), any()))

                .thenReturn(mThemeOverlayController.mColorScheme.getAccent2().get(6));

        when(mResources.getColor(eq(android.R.color.system_accent3_500), any()))

                .thenReturn(mThemeOverlayController.mColorScheme.getAccent3().get(6));

        when(mResources.getColor(eq(android.R.color.system_neutral1_500), any()))

                .thenReturn(mThemeOverlayController.mColorScheme.getNeutral1().get(6));

        when(mResources.getColor(eq(android.R.color.system_neutral2_500), any()))

                .thenReturn(mThemeOverlayController.mColorScheme.getNeutral2().get(6));



        // Defers event because we already have initial colors.

        verify(mThemeOverlayApplier, never())

                .applyCurrentUserOverlays(any(), any(), anyInt(), any());