Merge "Prevents showing Guests in switcher." into pi-dev (027a9673) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java

+12 −8

Original line number	Original line	Diff line number	Diff line
	@@ -91,8 +91,12 @@ public class UserGridRecyclerView extends RecyclerView implements
	private List<UserRecord> createUserRecords(List<UserInfo> userInfoList) {		private List<UserRecord> createUserRecords(List<UserInfo> userInfoList) {
	List<UserRecord> userRecords = new ArrayList<>();		List<UserRecord> userRecords = new ArrayList<>();
	for (UserInfo userInfo : userInfoList) {		for (UserInfo userInfo : userInfoList) {
			if (userInfo.isGuest()) {
			// Don't display guests in the switcher.
			continue;
			}
	boolean isForeground = mUserManagerHelper.getForegroundUserId() == userInfo.id;		boolean isForeground = mUserManagerHelper.getForegroundUserId() == userInfo.id;
	UserRecord record = new UserRecord(userInfo, false /* isGuest */,		UserRecord record = new UserRecord(userInfo, false /* isStartGuestSession */,
	false /* isAddUser */, isForeground);		false /* isAddUser */, isForeground);
	userRecords.add(record);		userRecords.add(record);
	}		}
	@@ -116,7 +120,7 @@ public class UserGridRecyclerView extends RecyclerView implements
	private UserRecord addGuestUserRecord() {		private UserRecord addGuestUserRecord() {
	UserInfo userInfo = new UserInfo();		UserInfo userInfo = new UserInfo();
	userInfo.name = mContext.getString(R.string.car_guest);		userInfo.name = mContext.getString(R.string.car_guest);
	return new UserRecord(userInfo, true /* isGuest */,		return new UserRecord(userInfo, true /* isStartGuestSession */,
	false /* isAddUser /, false / isForeground */);		false /* isAddUser /, false / isForeground */);
	}		}

	@@ -126,7 +130,7 @@ public class UserGridRecyclerView extends RecyclerView implements
	private UserRecord addUserRecord() {		private UserRecord addUserRecord() {
	UserInfo userInfo = new UserInfo();		UserInfo userInfo = new UserInfo();
	userInfo.name = mContext.getString(R.string.car_add_user);		userInfo.name = mContext.getString(R.string.car_add_user);
	return new UserRecord(userInfo, false /* isGuest */,		return new UserRecord(userInfo, false /* isStartGuestSession */,
	true /* isAddUser /, false / isForeground */);		true /* isAddUser /, false / isForeground */);
	}		}

	@@ -198,8 +202,8 @@ public class UserGridRecyclerView extends RecyclerView implements
	mUserSelectionListener.onUserSelected(userRecord);		mUserSelectionListener.onUserSelected(userRecord);
	}		}

	// If the user selects Guest, switch to Guest profile		// If the user selects Guest, start the guest session.
	if (userRecord.mIsGuest) {		if (userRecord.mIsStartGuestSession) {
	mUserManagerHelper.switchToGuest(mGuestName);		mUserManagerHelper.switchToGuest(mGuestName);
	return;		return;
	}		}
	@@ -313,14 +317,14 @@ public class UserGridRecyclerView extends RecyclerView implements
	public static final class UserRecord {		public static final class UserRecord {

	public final UserInfo mInfo;		public final UserInfo mInfo;
	public final boolean mIsGuest;		public final boolean mIsStartGuestSession;
	public final boolean mIsAddUser;		public final boolean mIsAddUser;
	public final boolean mIsForeground;		public final boolean mIsForeground;

	public UserRecord(UserInfo userInfo, boolean isGuest, boolean isAddUser,		public UserRecord(UserInfo userInfo, boolean isStartGuestSession, boolean isAddUser,
	boolean isForeground) {		boolean isForeground) {
	mInfo = userInfo;		mInfo = userInfo;
	mIsGuest = isGuest;		mIsStartGuestSession = isStartGuestSession;
	mIsAddUser = isAddUser;		mIsAddUser = isAddUser;
	mIsForeground = isForeground;		mIsForeground = isForeground;
	}		}