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

Merge "Update user icon when dark theme toggled" into sc-dev

Browse Source
This commit is contained in:
Peter Kalauskas
2021-04-26 22:48:07 +00:00
committed by Android (Google) Code Review
parent 840f73e773 1c3a6056f1
commit 92cbfe135f
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardQsUserSwitchController.java
View File

@@ -68,6 +68,7 @@ public class KeyguardQsUserSwitchController extends ViewController<UserAvatarVie
private UserSwitcherController.BaseUserAdapter mAdapter; private UserSwitcherController.BaseUserAdapter mAdapter;
private final KeyguardStateController mKeyguardStateController; private final KeyguardStateController mKeyguardStateController;
protected final SysuiStatusBarStateController mStatusBarStateController; protected final SysuiStatusBarStateController mStatusBarStateController;
private final ConfigurationController mConfigurationController;
private final KeyguardVisibilityHelper mKeyguardVisibilityHelper; private final KeyguardVisibilityHelper mKeyguardVisibilityHelper;
private final KeyguardUserDetailAdapter mUserDetailAdapter; private final KeyguardUserDetailAdapter mUserDetailAdapter;
private NotificationPanelViewController mNotificationPanelViewController; private NotificationPanelViewController mNotificationPanelViewController;
@@ -76,7 +77,6 @@ public class KeyguardQsUserSwitchController extends ViewController<UserAvatarVie
// State info for the user switch and keyguard // State info for the user switch and keyguard
private int mBarState; private int mBarState;
private float mDarkAmount;
private final StatusBarStateController.StateListener mStatusBarStateListener = private final StatusBarStateController.StateListener mStatusBarStateListener =
new StatusBarStateController.StateListener() { new StatusBarStateController.StateListener() {
@@ -97,6 +97,15 @@ public class KeyguardQsUserSwitchController extends ViewController<UserAvatarVie
} }
}; };
private ConfigurationController.ConfigurationListener
mConfigurationListener = new ConfigurationController.ConfigurationListener() {
@Override
public void onUiModeChanged() {
updateView(true);
}
};
@Inject @Inject
public KeyguardQsUserSwitchController( public KeyguardQsUserSwitchController(
UserAvatarView view, UserAvatarView view,
@@ -106,6 +115,7 @@ public class KeyguardQsUserSwitchController extends ViewController<UserAvatarVie
ScreenLifecycle screenLifecycle, ScreenLifecycle screenLifecycle,
UserSwitcherController userSwitcherController, UserSwitcherController userSwitcherController,
KeyguardStateController keyguardStateController, KeyguardStateController keyguardStateController,
ConfigurationController configurationController,
SysuiStatusBarStateController statusBarStateController, SysuiStatusBarStateController statusBarStateController,
DozeParameters dozeParameters, DozeParameters dozeParameters,
UiEventLogger uiEventLogger) { UiEventLogger uiEventLogger) {
@@ -117,6 +127,7 @@ public class KeyguardQsUserSwitchController extends ViewController<UserAvatarVie
mScreenLifecycle = screenLifecycle; mScreenLifecycle = screenLifecycle;
mUserSwitcherController = userSwitcherController; mUserSwitcherController = userSwitcherController;
mKeyguardStateController = keyguardStateController; mKeyguardStateController = keyguardStateController;
mConfigurationController = configurationController;
mStatusBarStateController = statusBarStateController; mStatusBarStateController = statusBarStateController;
mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mView, mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mView,
keyguardStateController, dozeParameters); keyguardStateController, dozeParameters);
@@ -153,8 +164,6 @@ public class KeyguardQsUserSwitchController extends ViewController<UserAvatarVie
R.string.accessibility_quick_settings_choose_user_action))); R.string.accessibility_quick_settings_choose_user_action)));
} }
}); });
updateView(true /* forceUpdate */);
} }
@Override @Override
@@ -163,6 +172,8 @@ public class KeyguardQsUserSwitchController extends ViewController<UserAvatarVie
mAdapter.registerDataSetObserver(mDataSetObserver); mAdapter.registerDataSetObserver(mDataSetObserver);
mDataSetObserver.onChanged(); mDataSetObserver.onChanged();
mStatusBarStateController.addCallback(mStatusBarStateListener); mStatusBarStateController.addCallback(mStatusBarStateListener);
mConfigurationController.addCallback(mConfigurationListener);
updateView(true /* forceUpdate */);
} }
@Override @Override
@@ -171,6 +182,7 @@ public class KeyguardQsUserSwitchController extends ViewController<UserAvatarVie
mAdapter.unregisterDataSetObserver(mDataSetObserver); mAdapter.unregisterDataSetObserver(mDataSetObserver);
mStatusBarStateController.removeCallback(mStatusBarStateListener); mStatusBarStateController.removeCallback(mStatusBarStateListener);
mConfigurationController.removeCallback(mConfigurationListener);
} }
public final DataSetObserver mDataSetObserver = new DataSetObserver() { public final DataSetObserver mDataSetObserver = new DataSetObserver() {