commit 4093e40e18f2e8d395ca467f54aef6e763c394f6
author Amith Yamasani <yamasani@google.com> Fri Jun 06 14:31:37 2014 -0700
committer Amith Yamasani <yamasani@google.com> Fri Jun 06 14:31:37 2014 -0700
tree 2879be164f4f5bcb9767c03abe9958928967a67a
parent b76de1d4fabf8381d73df22439e6fac839bd33e7

Show user management UI if a managed profile exists

Show UI even if flags to show multiuser UI are off, if there's a
second user on the device. This way there's an affordance to remove
the user.

Don't show the "Add user" item though.

Bug: 15447068
Change-Id: I40273005d6d8d66aed486328615acdab71d51fa4

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 6ba79cc..7dcdfbc 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -1043,8 +1043,12 @@
                         category.removeTile(n);
                     }
                 } else if (id == R.id.user_settings) {
+                    boolean hasMultipleUsers =
+                            ((UserManager) getSystemService(Context.USER_SERVICE))
+                                    .getUserCount() > 1;
                     if (!UserHandle.MU_ENABLED
-                            || !UserManager.supportsMultipleUsers()
+                            || (!UserManager.supportsMultipleUsers()
+                                    && !hasMultipleUsers)
                             || Utils.isMonkeyRunning()) {
                         category.removeTile(n);
                     }