From 81e3e941fbfa8fd0ddb68699fa26cce7b459036d Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Thu, 18 Sep 2014 21:11:20 +0200 Subject: [PATCH] Disable QS user switcher when not supported Bug: 17570310 Change-Id: Id32e076928c92c663645024f0d38b26ec4667b78 --- .../systemui/statusbar/phone/MultiUserSwitch.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java index 685c184a672a9..4715d0abd9962 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java @@ -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(); + } }