Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Apply colors a bit earlier when switching users"" into sc-dev

Browse Source
This commit is contained in:
Adam Bookatz
2021-06-23 20:03:43 +00:00
committed by Android (Google) Code Review
parent 31bb5762d8 4cfb4ca966
commit 29852f8aa0
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
View File

@@ -241,7 +241,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
boolean newWorkProfile = Intent.ACTION_MANAGED_PROFILE_ADDED.equals(intent.getAction()); boolean newWorkProfile = Intent.ACTION_MANAGED_PROFILE_ADDED.equals(intent.getAction());
boolean userStarted = Intent.ACTION_USER_STARTED.equals(intent.getAction()); boolean userStarted = Intent.ACTION_USER_SWITCHED.equals(intent.getAction());
boolean isManagedProfile = mUserManager.isManagedProfile( boolean isManagedProfile = mUserManager.isManagedProfile(
intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0)); intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0));
if (userStarted || newWorkProfile) { if (userStarted || newWorkProfile) {
@@ -288,7 +288,7 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
public void start() { public void start() {
if (DEBUG) Log.d(TAG, "Start"); if (DEBUG) Log.d(TAG, "Start");
final IntentFilter filter = new IntentFilter(); final IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_USER_STARTED); filter.addAction(Intent.ACTION_USER_SWITCHED);
filter.addAction(Intent.ACTION_MANAGED_PROFILE_ADDED); filter.addAction(Intent.ACTION_MANAGED_PROFILE_ADDED);
filter.addAction(Intent.ACTION_WALLPAPER_CHANGED); filter.addAction(Intent.ACTION_WALLPAPER_CHANGED);
mBroadcastDispatcher.registerReceiver(mBroadcastReceiver, filter, mMainExecutor, mBroadcastDispatcher.registerReceiver(mBroadcastReceiver, filter, mMainExecutor,

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

@@ -414,13 +414,6 @@ public class ThemeOverlayControllerTest extends SysuiTestCase {
.applyCurrentUserOverlays(any(), any(), anyInt(), any()); .applyCurrentUserOverlays(any(), any(), anyInt(), any());
} }
@Test
public void onUserSwitch_setsTheme() {
mBroadcastReceiver.getValue().onReceive(null,
new Intent(Intent.ACTION_USER_STARTED));
verify(mThemeOverlayApplier).applyCurrentUserOverlays(any(), any(), anyInt(), any());
}
@Test @Test
public void onProfileAdded_setsTheme() { public void onProfileAdded_setsTheme() {
mBroadcastReceiver.getValue().onReceive(null, mBroadcastReceiver.getValue().onReceive(null,