From 4658080acc4d17cf36870074ff3eb0af03a104b8 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 20 Feb 2020 17:33:17 +0000
Subject: [PATCH] Don't re-order users in the lock screen / quick settings user
 switcher.

Keep the position of users static to reduce (perceived) jank of user
switching.

Bug:146426568
Test: Manual
Change-Id: Id6f544803531ee2121d885909f88f907c3bb4957
---
 .../systemui/statusbar/policy/UserSwitcherController.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
index 8dfcb0ac215da..9ce31d030c43e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
@@ -236,8 +236,7 @@ public class UserSwitcherController implements Dumpable {
                                             picture, avatarSize, avatarSize, true);
                                 }
                             }
-                            int index = isCurrent ? 0 : records.size();
-                            records.add(index, new UserRecord(info, picture, false /* isGuest */,
+                            records.add(new UserRecord(info, picture, false /* isGuest */,
                                     isCurrent, false /* isAddUser */, false /* isRestricted */,
                                     switchToEnabled));
                         }
@@ -269,8 +268,7 @@ public class UserSwitcherController implements Dumpable {
                         records.add(guestRecord);
                     }
                 } else {
-                    int index = guestRecord.isCurrent ? 0 : records.size();
-                    records.add(index, guestRecord);
+                    records.add(guestRecord);
                 }
 
                 if (canCreateUser) {