Merge "Fix issue where theme would be accepted in SUW" into sc-dev (d765a063) · Commits · e / os / android_frameworks_base

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -151,6 +151,10 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
		+ wallpaperColors);
		mDeferredThemeEvaluation = true;
		return;
		} else if (mDeferredThemeEvaluation) {
		Log.i(TAG, "Wallpaper color event received, but we already were deferring eval: "
		+ wallpaperColors);
		return;
		} else {
		if (DEBUG) {
		Log.i(TAG, "During user setup, but allowing first color event: had? "

+12 −0

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

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

		// Regression test: null events should not reset the internal state and allow colors to be
		// applied again.
		clearInvocations(mThemeOverlayApplier);
		mBroadcastReceiver.getValue().onReceive(null, new Intent(Intent.ACTION_WALLPAPER_CHANGED));
		mColorsListener.getValue().onColorsChanged(null, WallpaperManager.FLAG_SYSTEM);
		verify(mThemeOverlayApplier, never()).applyCurrentUserOverlays(any(), any(), anyInt(),
		any());
		mColorsListener.getValue().onColorsChanged(new WallpaperColors(Color.valueOf(Color.GREEN),
		null, null), WallpaperManager.FLAG_SYSTEM);
		verify(mThemeOverlayApplier, never()).applyCurrentUserOverlays(any(), any(), anyInt(),
		any());
		}

		@Test