Merge "Disable QS user switcher when not supported" into lmp-dev (59b17d83) · Commits · e / os / android_frameworks_base

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

+7 −4

Original line number	Diff line number	Diff line
		@@ -67,8 +67,7 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener

		@Override
		public void onClick(View v) {
		final UserManager um = UserManager.get(getContext());
		if (um.isUserSwitcherEnabled()) {
		if (opensUserSwitcherWhenClicked()) {
		if (mKeyguardMode) {
		if (mKeyguardUserSwitcher != null) {
		mKeyguardUserSwitcher.show(true /* animate */);
		@@ -92,9 +91,8 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener
		super.onPopulateAccessibilityEvent(event);

		if (isClickable()) {
		final UserManager um = UserManager.get(getContext());
		String text;
		if (um.isUserSwitcherEnabled()) {
		if (opensUserSwitcherWhenClicked()) {
		String currentUser = null;
		if (mQsPanel != null) {
		UserSwitcherController controller = mQsPanel.getHost()
		@@ -122,4 +120,9 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener
		public boolean hasOverlappingRendering() {
		return false;
		}

		private boolean opensUserSwitcherWhenClicked() {
		UserManager um = UserManager.get(getContext());
		return UserManager.supportsMultipleUsers() && um.isUserSwitcherEnabled();
		}
		}