summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author George Lin <giolin@google.com> 2024-12-17 15:24:35 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2024-12-17 15:24:35 -0800
commit9f129f2f12d1e6d722809971056314ea98c2516f (patch)
treec8c5e2f5377aec5a872eb7d18703df3bee417da4
parent25938ed611dc793b403639d6d5dda6953579ada9 (diff)
parent18e650e7e7d0c9013cd5db08fed633053268510d (diff)
Merge "Run onWallpaperColorsChanged_changeLockWallpaper only when flag off" into main
-rw-r--r--packages/SystemUI/multivalentTests/src/com/android/systemui/theme/ThemeOverlayControllerTest.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/theme/ThemeOverlayControllerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/theme/ThemeOverlayControllerTest.java
index 7b52dd836b51..5cd0846ded7e 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/theme/ThemeOverlayControllerTest.java
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/theme/ThemeOverlayControllerTest.java
@@ -501,6 +501,7 @@ public class ThemeOverlayControllerTest extends SysuiTestCase {
}
@Test
+ @DisableFlags(com.android.systemui.shared.Flags.FLAG_NEW_CUSTOMIZATION_PICKER_UI)
public void onWallpaperColorsChanged_changeLockWallpaper() {
// Should ask for a new theme when wallpaper colors change
WallpaperColors mainColors = new WallpaperColors(Color.valueOf(Color.RED),