Merge "Always put current user first in user switchers" into lmp-dev (aa6e09e7) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -158,8 +158,9 @@ public class UserSwitcherController {
		picture = BitmapHelper.createCircularClip(
		picture, avatarSize, avatarSize);
		}
		records.add(new UserRecord(info, picture, false /* isGuest */, isCurrent,
		false /* isAddUser /, false / isRestricted */));
		int index = isCurrent ? 0 : records.size();
		records.add(index, new UserRecord(info, picture, false /* isGuest */,
		isCurrent, false /* isAddUser /, false / isRestricted */));
		}
		}

		@@ -182,7 +183,8 @@ public class UserSwitcherController {
		false /* isAddUser */, createIsRestricted));
		}
		} else {
		records.add(guestRecord);
		int index = guestRecord.isCurrent ? 0 : records.size();
		records.add(index, guestRecord);
		}
		}