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

Commit cc9b8b9b authored by Chris Poultney's avatar Chris Poultney Committed by Automerger Merge Worker
Browse files

Merge "Fix lingering theme color reset on reboot issue" into tm-qpr-dev am:... 

Merge "Fix lingering theme color reset on reboot issue" into tm-qpr-dev am: f5283b48 am: b6bfa1a7

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



Change-Id: I935b9db98c47c176937b8d40a66e019cbea46d62
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2fe1f67e b6bfa1a7

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

+4 −0
Original line number Diff line number Diff line
@@ -171,6 +171,10 @@ public class ThemeOverlayController extends CoreStartable implements Dumpable { 


        @Override

        public void onColorsChanged(WallpaperColors wallpaperColors, int which, int userId) {

            WallpaperColors currentColors = mCurrentColors.get(userId);

            if (wallpaperColors != null && wallpaperColors.equals(currentColors)) {

                return;

            }

            boolean currentUser = userId == mUserTracker.getUserId();

            if (currentUser && !mAcceptColorEvents

                    && mWakefulnessLifecycle.getWakefulness() != WAKEFULNESS_ASLEEP) {

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

+27 −0
Original line number Diff line number Diff line
@@ -885,4 +885,31 @@ public class ThemeOverlayControllerTest extends SysuiTestCase { 
        assertThat(themeOverlays.getValue().get(OVERLAY_CATEGORY_SYSTEM_PALETTE))

                .isEqualTo(new OverlayIdentifier("ff00ff00"));

    }



    // Regression test for b/234603929, where a reboot would generate a wallpaper colors changed

    // event for the already-set colors that would then set the theme incorrectly on screen sleep.

    @Test

    public void onWallpaperColorsSetToSame_keepsTheme() {

        // Set initial colors and verify.

        WallpaperColors startingColors = new WallpaperColors(Color.valueOf(Color.RED),

                Color.valueOf(Color.BLUE), null);

        WallpaperColors sameColors = new WallpaperColors(Color.valueOf(Color.RED),

                Color.valueOf(Color.BLUE), null);

        mColorsListener.getValue().onColorsChanged(startingColors, WallpaperManager.FLAG_SYSTEM,

                USER_SYSTEM);

        verify(mThemeOverlayApplier)

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

        clearInvocations(mThemeOverlayApplier);



        // Set to the same colors.

        mColorsListener.getValue().onColorsChanged(sameColors, WallpaperManager.FLAG_SYSTEM,

                USER_SYSTEM);

        verify(mThemeOverlayApplier, never())

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



        // Verify that no change resulted.

        mWakefulnessLifecycleObserver.getValue().onFinishedGoingToSleep();

        verify(mThemeOverlayApplier, never()).applyCurrentUserOverlays(any(), any(), anyInt(),

                any());

    }

}