From e750ddd8fbfd8ab577162316946f28f5e15bf5a2 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Wed, 9 Jun 2021 21:16:47 -0700 Subject: [PATCH] Apply colors when a non managed user is added This way we'll be able to have colors on SetupWizard when added a secondary user. Test: manual Test: atest ThemeOverlayControllerTest Fixes: 189168701 Change-Id: I8c7e5cc3a4804c34ad4ace0ba473a373b939cb83 --- .../systemui/theme/ThemeOverlayController.java | 11 +++++++---- .../systemui/theme/ThemeOverlayControllerTest.java | 11 +++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java index 428921ee34ecd..1ce2dacf7751c 100644 --- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java +++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java @@ -240,11 +240,14 @@ public class ThemeOverlayController extends SystemUI implements Dumpable { private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - if (Intent.ACTION_USER_STARTED.equals(intent.getAction()) - || Intent.ACTION_MANAGED_PROFILE_ADDED.equals(intent.getAction())) { - if (!mDeviceProvisionedController.isCurrentUserSetup()) { + boolean newWorkProfile = Intent.ACTION_MANAGED_PROFILE_ADDED.equals(intent.getAction()); + boolean userStarted = Intent.ACTION_USER_STARTED.equals(intent.getAction()); + boolean isManagedProfile = mUserManager.isManagedProfile( + intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0)); + if (userStarted || newWorkProfile) { + if (!mDeviceProvisionedController.isCurrentUserSetup() && isManagedProfile) { Log.i(TAG, "User setup not finished when " + intent.getAction() - + " was received. Deferring..."); + + " was received. Deferring... Managed profile? " + isManagedProfile); return; } if (DEBUG) Log.d(TAG, "Updating overlays for user switch / profile added."); diff --git a/packages/SystemUI/tests/src/com/android/systemui/theme/ThemeOverlayControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/theme/ThemeOverlayControllerTest.java index 3cf92126c5c60..208790b24d8ad 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/theme/ThemeOverlayControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/theme/ThemeOverlayControllerTest.java @@ -428,9 +428,20 @@ public class ThemeOverlayControllerTest extends SysuiTestCase { verify(mThemeOverlayApplier).applyCurrentUserOverlays(any(), any(), anyInt(), any()); } + @Test + public void onUserAdded_appliesTheme_ifNotManagedProfile() { + reset(mDeviceProvisionedController); + when(mUserManager.isManagedProfile(anyInt())).thenReturn(false); + mBroadcastReceiver.getValue().onReceive(null, + new Intent(Intent.ACTION_MANAGED_PROFILE_ADDED)); + verify(mThemeOverlayApplier) + .applyCurrentUserOverlays(any(), any(), anyInt(), any()); + } + @Test public void onProfileAdded_ignoresUntilSetupComplete() { reset(mDeviceProvisionedController); + when(mUserManager.isManagedProfile(anyInt())).thenReturn(true); mBroadcastReceiver.getValue().onReceive(null, new Intent(Intent.ACTION_MANAGED_PROFILE_ADDED)); verify(mThemeOverlayApplier, never())