diff options
| author | 2022-10-26 16:03:54 +0000 | |
|---|---|---|
| committer | 2022-10-27 09:48:43 +0000 | |
| commit | 062a9fe9c4ed7665bc7da1240e1c8fa197bd66bd (patch) | |
| tree | f02e3eb62e50fe1119f9ca882753f3d067d213f2 | |
| parent | b4ee398e8b2f1b2dd6d6fd5abd97c3c2be06b2ad (diff) | |
Remove Monochrome API Gating
Test: atest SystemPalleteTest
Bug: 251451171
Change-Id: Ic025bce051a2169eedc6521ea332d412ae445a57
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java index 3ecb15b9d79c..5894fd385ee3 100644 --- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java +++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java @@ -115,7 +115,6 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { private final SecureSettings mSecureSettings; private final Executor mMainExecutor; private final Handler mBgHandler; - private final boolean mIsMonochromaticEnabled; private final Context mContext; private final boolean mIsMonetEnabled; private final UserTracker mUserTracker; @@ -365,7 +364,6 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { UserTracker userTracker, DumpManager dumpManager, FeatureFlags featureFlags, @Main Resources resources, WakefulnessLifecycle wakefulnessLifecycle) { mContext = context; - mIsMonochromaticEnabled = featureFlags.isEnabled(Flags.MONOCHROMATIC_THEMES); mIsMonetEnabled = featureFlags.isEnabled(Flags.MONET); mDeviceProvisionedController = deviceProvisionedController; mBroadcastDispatcher = broadcastDispatcher; @@ -669,11 +667,8 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { // used as a system-wide theme. // - Content intentionally excluded, intended for media player, not system-wide List<Style> validStyles = new ArrayList<>(Arrays.asList(Style.EXPRESSIVE, Style.SPRITZ, - Style.TONAL_SPOT, Style.FRUIT_SALAD, Style.RAINBOW, Style.VIBRANT)); - - if (mIsMonochromaticEnabled) { - validStyles.add(Style.MONOCHROMATIC); - } + Style.TONAL_SPOT, Style.FRUIT_SALAD, Style.RAINBOW, Style.VIBRANT, + Style.MONOCHROMATIC)); Style style = mThemeStyle; final String overlayPackageJson = mSecureSettings.getStringForUser( |