Merge "Makes current user not clickable" into qt-qpr1-dev

2019-09-03 12:59:22 +00:00
parent 41751064bc baad236610
commit 32acc3e3bb
1 changed files with 4 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java
@@ -76,8 +76,11 @@ public class UserDetailView extends PseudoGridView {
                UserSwitcherController.UserRecord item) {
            UserDetailItemView v = UserDetailItemView.convertOrInflate(
                    mContext, convertView, parent);
-            if (v != convertView) {
+            if ((v != convertView && !item.isCurrent) || item.isGuest) {
                v.setOnClickListener(this);
+            } else {
+                v.setOnClickListener(null);
+                v.setClickable(false);
            }
            String name = getName(mContext, item);
            if (item.picture == null) {