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

am 664bd7b8: am 30defcc4: Merge "Disable QS user switcher when not supported" into lmp-dev

Browse Source 
* commit '664bd7b8266b268dc345cce212a51fc735122fe9':
  Disable QS user switcher when not supported
This commit is contained in:
Adrian Roos
2014-09-18 21:52:31 +00:00
committed by Android Git Automerger
parent e607245485 869377d2b5
commit 2ae32f0852
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();
}
}