summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlejandro Nijamkin <nijamkin@google.com>2022-12-15 16:42:42 -0800
committerAlejandro Nijamkin <nijamkin@google.com>2022-12-17 15:34:04 -0800
commit9825cdb58667e3eb1b54e1e6c82fe1546ab2b94e (patch)
treed54a8a9dc8e3b50a7b9404c0fe5173e4b52830fb
parent715c42cb380c1662f85eb9c33a04bb183ed4be7e (diff)
downloadThemePicker-9825cdb58667e3eb1b54e1e6c82fe1546ab2b94e.tar.gz
Defines flag for ravemped WPP UI (4/5).
This flag is owned in System UI and served to Wallpaper Picker (WPP) through the existing content provider for quick affordances. Bug: 262780448 Test: manually made sure that I can read the flag value in wallpaper picker and its value matches whatever I set the flag to. Change-Id: Ia3f85b4ecd63a70d48a8cd26a88a7d93f17f44db
-rw-r--r--src/com/android/customization/model/color/ColorProvider.kt6
-rw-r--r--src/com/android/customization/module/ThemePickerInjector.java11
-rw-r--r--tests/src/com/android/customization/testing/TestCustomizationInjector.java11
3 files changed, 26 insertions, 2 deletions
diff --git a/src/com/android/customization/model/color/ColorProvider.kt b/src/com/android/customization/model/color/ColorProvider.kt
index c1a45527..159d08fc 100644
--- a/src/com/android/customization/model/color/ColorProvider.kt
+++ b/src/com/android/customization/model/color/ColorProvider.kt
@@ -37,7 +37,6 @@ import com.android.customization.model.color.ColorUtils.toColorString
import com.android.systemui.monet.ColorScheme
import com.android.systemui.monet.Style
import com.android.wallpaper.compat.WallpaperManagerCompat
-import com.android.wallpaper.config.Flags
import com.android.wallpaper.module.InjectorProvider
import java.util.*
import kotlinx.coroutines.CoroutineScope
@@ -287,7 +286,10 @@ class ColorProvider(context: Context, stubPackageName: String) :
Style.TONAL_SPOT
}
- if (style == Style.MONOCHROMATIC && !Flags.isMonochromaticFlagEnabled) {
+ if (
+ style == Style.MONOCHROMATIC &&
+ !InjectorProvider.getInjector().flags.isMonochromaticFlagEnabled()
+ ) {
continue
}
diff --git a/src/com/android/customization/module/ThemePickerInjector.java b/src/com/android/customization/module/ThemePickerInjector.java
index 43a104bc..7342d384 100644
--- a/src/com/android/customization/module/ThemePickerInjector.java
+++ b/src/com/android/customization/module/ThemePickerInjector.java
@@ -38,6 +38,7 @@ import com.android.customization.picker.quickaffordance.domain.interactor.Keygua
import com.android.customization.picker.quickaffordance.ui.viewmodel.KeyguardQuickAffordancePickerViewModel;
import com.android.systemui.shared.quickaffordance.data.content.KeyguardQuickAffordanceProviderClient;
import com.android.systemui.shared.quickaffordance.data.content.KeyguardQuickAffordanceProviderClientImpl;
+import com.android.wallpaper.config.BaseFlags;
import com.android.wallpaper.model.LiveWallpaperInfo;
import com.android.wallpaper.model.WallpaperInfo;
import com.android.wallpaper.module.CustomizationSections;
@@ -64,6 +65,7 @@ public class ThemePickerInjector extends WallpaperPicker2Injector
mKeyguardQuickAffordancePickerViewModelFactory;
private KeyguardQuickAffordanceProviderClient mKeyguardQuickAffordanceProviderClient;
private FragmentFactory mFragmentFactory;
+ private BaseFlags mFlags;
@Override
public CustomizationSections getCustomizationSections(Activity activity) {
@@ -182,4 +184,13 @@ public class ThemePickerInjector extends WallpaperPicker2Injector
return mKeyguardQuickAffordanceProviderClient;
}
+
+ @Override
+ public BaseFlags getFlags() {
+ if (mFlags == null) {
+ mFlags = new BaseFlags() {};
+ }
+
+ return mFlags;
+ }
}
diff --git a/tests/src/com/android/customization/testing/TestCustomizationInjector.java b/tests/src/com/android/customization/testing/TestCustomizationInjector.java
index 15898c18..ed53751b 100644
--- a/tests/src/com/android/customization/testing/TestCustomizationInjector.java
+++ b/tests/src/com/android/customization/testing/TestCustomizationInjector.java
@@ -15,6 +15,7 @@ import com.android.customization.picker.quickaffordance.domain.interactor.Keygua
import com.android.customization.picker.quickaffordance.ui.viewmodel.KeyguardQuickAffordancePickerViewModel;
import com.android.systemui.shared.quickaffordance.data.content.KeyguardQuickAffordanceProviderClient;
import com.android.systemui.shared.quickaffordance.data.content.KeyguardQuickAffordanceProviderClientImpl;
+import com.android.wallpaper.config.BaseFlags;
import com.android.wallpaper.module.DrawableLayerResolver;
import com.android.wallpaper.module.PackageStatusNotifier;
import com.android.wallpaper.module.UserEventLogger;
@@ -34,6 +35,7 @@ public class TestCustomizationInjector extends TestInjector implements Customiza
private KeyguardQuickAffordancePickerInteractor mKeyguardQuickAffordancePickerInteractor;
private KeyguardQuickAffordancePickerViewModel.Factory
mKeyguardQuickAffordancePickerViewModelFactory;
+ private BaseFlags mFlags;
@Override
public CustomizationPreferences getCustomizationPreferences(Context context) {
@@ -91,4 +93,13 @@ public class TestCustomizationInjector extends TestInjector implements Customiza
}
return mKeyguardQuickAffordancePickerInteractor;
}
+
+ @Override
+ public BaseFlags getFlags() {
+ if (mFlags == null) {
+ mFlags = new BaseFlags() {};
+ }
+
+ return mFlags;
+ }
}