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

Commit 30377db9 authored Aug 03, 2021 by Caitlin Cassidy

[View Controllers] Move

KeyguardStatusBarView#setKeyguardUserSwitcherEnabled
to the controller.

Test: manual
Bug: 195442899
Change-Id: I770c45728618f07a27be0b83d8a1194cd9ef1dd1

parent e2d1f533

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -321,7 +321,7 @@ public class KeyguardStatusBarView extends RelativeLayout {
	}		}
	}		}

	public void setKeyguardUserSwitcherEnabled(boolean enabled) {		void setKeyguardUserSwitcherEnabled(boolean enabled) {
	mKeyguardUserSwitcherEnabled = enabled;		mKeyguardUserSwitcherEnabled = enabled;
	}		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -183,6 +183,11 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat
	mView.onThemeChanged(mTintedIconManager);		mView.onThemeChanged(mTintedIconManager);
	}		}

			/** Sets whether user switcher is enabled. */
			public void setKeyguardUserSwitcherEnabled(boolean enabled) {
			mView.setKeyguardUserSwitcherEnabled(enabled);
			}

	/** Sets whether this controller should listen to battery updates. */		/** Sets whether this controller should listen to battery updates. */
	public void setBatteryListening(boolean listening) {		public void setBatteryListening(boolean listening) {
	if (listening == mBatteryListening) {		if (listening == mBatteryListening) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1014,16 +1014,16 @@ public class NotificationPanelViewController extends PanelViewController {
	userSwitcherComponent.getKeyguardQsUserSwitchController();		userSwitcherComponent.getKeyguardQsUserSwitchController();
	mKeyguardQsUserSwitchController.setNotificationPanelViewController(this);		mKeyguardQsUserSwitchController.setNotificationPanelViewController(this);
	mKeyguardQsUserSwitchController.init();		mKeyguardQsUserSwitchController.init();
	mKeyguardStatusBar.setKeyguardUserSwitcherEnabled(true);		mKeyguardStatusBarViewController.setKeyguardUserSwitcherEnabled(true);
	} else if (keyguardUserSwitcherView != null) {		} else if (keyguardUserSwitcherView != null) {
	KeyguardUserSwitcherComponent userSwitcherComponent =		KeyguardUserSwitcherComponent userSwitcherComponent =
	mKeyguardUserSwitcherComponentFactory.build(keyguardUserSwitcherView);		mKeyguardUserSwitcherComponentFactory.build(keyguardUserSwitcherView);
	mKeyguardUserSwitcherController =		mKeyguardUserSwitcherController =
	userSwitcherComponent.getKeyguardUserSwitcherController();		userSwitcherComponent.getKeyguardUserSwitcherController();
	mKeyguardUserSwitcherController.init();		mKeyguardUserSwitcherController.init();
	mKeyguardStatusBar.setKeyguardUserSwitcherEnabled(true);		mKeyguardStatusBarViewController.setKeyguardUserSwitcherEnabled(true);
	} else {		} else {
	mKeyguardStatusBar.setKeyguardUserSwitcherEnabled(false);		mKeyguardStatusBarViewController.setKeyguardUserSwitcherEnabled(false);
	}		}
	}		}