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

Commit 55c21712 authored by Aurélien Pomini's avatar Aurélien Pomini
Browse files

Move contrast API: adapt ThemeOverlayController 

Part of the move of the API from AccessibilityManager to UiModeManager.

Bug: 259091608
Test: atest SystemUITests
Change-Id: Ic075ff37d7723af507c0ca6b24f2586e0cfd10a7
parent cbbc772a

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

+11 −11
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_COLOR_INDEX 
import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_COLOR_SOURCE;

import static com.android.systemui.theme.ThemeOverlayApplier.TIMESTAMP_FIELD;



import android.app.UiModeManager;

import android.app.WallpaperColors;

import android.app.WallpaperManager;

import android.app.WallpaperManager.OnColorsChangedListener;
@@ -54,7 +55,6 @@ import android.util.ArraySet; 
import android.util.Log;

import android.util.SparseArray;

import android.util.SparseIntArray;

import android.view.accessibility.AccessibilityManager;



import androidx.annotation.NonNull;

import androidx.annotation.VisibleForTesting;
@@ -140,8 +140,8 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { 
    private boolean mNeedsOverlayCreation;

    // Dominant color extracted from wallpaper, NOT the color used on the overlay

    protected int mMainWallpaperColor = Color.TRANSPARENT;

    // UI contrast as reported by AccessibilityManager

    private float mUiContrast = 0;

    // UI contrast as reported by UiModeManager

    private float mContrast = 0;

    // Theme variant: Vibrant, Tonal, Expressive, etc

    @VisibleForTesting

    protected Style mThemeStyle = Style.TONAL_SPOT;
@@ -158,7 +158,7 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { 
    private final SparseArray<WallpaperColors> mDeferredWallpaperColors = new SparseArray<>();

    private final SparseIntArray mDeferredWallpaperColorsFlags = new SparseIntArray();

    private final WakefulnessLifecycle mWakefulnessLifecycle;

    private final AccessibilityManager mAccessibilityManager;

    private final UiModeManager mUiModeManager;

    private DynamicScheme mDynamicSchemeDark;

    private DynamicScheme mDynamicSchemeLight;
@@ -392,7 +392,7 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { 
            FeatureFlags featureFlags,

            @Main Resources resources,

            WakefulnessLifecycle wakefulnessLifecycle,

            AccessibilityManager accessibilityManager) {

            UiModeManager uiModeManager) {

        mContext = context;

        mIsMonochromaticEnabled = featureFlags.isEnabled(Flags.MONOCHROMATIC_THEME);

        mIsMonetEnabled = featureFlags.isEnabled(Flags.MONET);
@@ -408,7 +408,7 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { 
        mUserTracker = userTracker;

        mResources = resources;

        mWakefulnessLifecycle = wakefulnessLifecycle;

        mAccessibilityManager = accessibilityManager;

        mUiModeManager = uiModeManager;

        dumpManager.registerDumpable(TAG, this);

    }
@@ -445,9 +445,9 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { 
                    }

                },

                UserHandle.USER_ALL);

        mUiContrast = mAccessibilityManager.getUiContrast();

        mAccessibilityManager.addUiContrastChangeListener(mMainExecutor, uiContrast -> {

            mUiContrast = uiContrast;

        mContrast = mUiModeManager.getContrast();

        mUiModeManager.addContrastChangeListener(mMainExecutor, contrast -> {

            mContrast = contrast;

            // Force reload so that we update even when the main color has not changed

            reevaluateSystemTheme(true /* forceReload */);

        });
@@ -586,9 +586,9 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { 
        mSecondaryOverlay = createAccentOverlay();



        mDynamicSchemeDark = dynamicSchemeFromStyle(

                mThemeStyle, color, true /* isDark */, mUiContrast);

                mThemeStyle, color, true /* isDark */, mContrast);

        mDynamicSchemeLight = dynamicSchemeFromStyle(

                mThemeStyle, color, false /* isDark */, mUiContrast);

                mThemeStyle, color, false /* isDark */, mContrast);

        mDynamicOverlay = createDynamicOverlay();

    }

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

+6 −6
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.when;



import android.app.UiModeManager;

import android.app.WallpaperColors;

import android.app.WallpaperManager;

import android.content.BroadcastReceiver;
@@ -47,7 +48,6 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.provider.Settings;

import android.testing.AndroidTestingRunner;

import android.view.accessibility.AccessibilityManager;



import androidx.annotation.VisibleForTesting;

import androidx.test.filters.SmallTest;
@@ -116,7 +116,7 @@ public class ThemeOverlayControllerTest extends SysuiTestCase { 
    @Mock

    private WakefulnessLifecycle mWakefulnessLifecycle;

    @Mock

    private AccessibilityManager mAccessibilityManager;

    private UiModeManager mUiModeManager;

    @Captor

    private ArgumentCaptor<BroadcastReceiver> mBroadcastReceiver;

    @Captor
@@ -135,7 +135,7 @@ public class ThemeOverlayControllerTest extends SysuiTestCase { 
        MockitoAnnotations.initMocks(this);

        when(mFeatureFlags.isEnabled(Flags.MONET)).thenReturn(true);

        when(mWakefulnessLifecycle.getWakefulness()).thenReturn(WAKEFULNESS_AWAKE);

        when(mAccessibilityManager.getUiContrast()).thenReturn(0.5f);

        when(mUiModeManager.getContrast()).thenReturn(0.5f);

        when(mDeviceProvisionedController.isCurrentUserSetup()).thenReturn(true);

        when(mResources.getColor(eq(android.R.color.system_accent1_500), any()))

                .thenReturn(Color.RED);
@@ -151,7 +151,7 @@ public class ThemeOverlayControllerTest extends SysuiTestCase { 
                mBroadcastDispatcher, mBgHandler, mMainExecutor, mBgExecutor, mThemeOverlayApplier,

                mSecureSettings, mWallpaperManager, mUserManager, mDeviceProvisionedController,

                mUserTracker, mDumpManager, mFeatureFlags, mResources, mWakefulnessLifecycle,

                mAccessibilityManager) {

                mUiModeManager) {

            @VisibleForTesting

            protected boolean isNightMode() {

                return false;
@@ -733,7 +733,7 @@ public class ThemeOverlayControllerTest extends SysuiTestCase { 
                mBroadcastDispatcher, mBgHandler, executor, executor, mThemeOverlayApplier,

                mSecureSettings, mWallpaperManager, mUserManager, mDeviceProvisionedController,

                mUserTracker, mDumpManager, mFeatureFlags, mResources, mWakefulnessLifecycle,

                mAccessibilityManager) {

                mUiModeManager) {

            @VisibleForTesting

            protected boolean isNightMode() {

                return false;
@@ -773,7 +773,7 @@ public class ThemeOverlayControllerTest extends SysuiTestCase { 
                mBroadcastDispatcher, mBgHandler, executor, executor, mThemeOverlayApplier,

                mSecureSettings, mWallpaperManager, mUserManager, mDeviceProvisionedController,

                mUserTracker, mDumpManager, mFeatureFlags, mResources, mWakefulnessLifecycle,

                mAccessibilityManager) {

                mUiModeManager) {

            @VisibleForTesting

            protected boolean isNightMode() {

                return false;