import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
-import android.car.user.CarUserManagerHelper;
import android.content.Context;
import android.view.View;
import android.view.ViewStub;
import android.support.v7.widget.GridLayoutManager;
+import com.android.settingslib.users.UserManagerHelper;
import com.android.systemui.R;
import com.android.systemui.statusbar.phone.StatusBar;
private final UserGridRecyclerView mUserGridView;
private final int mShortAnimDuration;
private final StatusBar mStatusBar;
- private final CarUserManagerHelper mCarUserManagerHelper;
+ private final UserManagerHelper mUserManagerHelper;
private int mCurrentForegroundUserId;
private boolean mShowing;
mUserGridView.buildAdapter();
mUserGridView.setUserSelectionListener(this::onUserSelected);
- mCarUserManagerHelper = new CarUserManagerHelper(context);
+ mUserManagerHelper = new UserManagerHelper(context);
updateCurrentForegroundUser();
mShortAnimDuration = mContainer.getResources()
}
private boolean foregroundUserChanged() {
- return mCurrentForegroundUserId != mCarUserManagerHelper.getCurrentForegroundUserId();
+ return mCurrentForegroundUserId != mUserManagerHelper.getForegroundUserId();
}
private void updateCurrentForegroundUser() {
- mCurrentForegroundUserId = mCarUserManagerHelper.getCurrentForegroundUserId();
+ mCurrentForegroundUserId = mUserManagerHelper.getForegroundUserId();
}
private void onUserSelected(UserGridRecyclerView.UserRecord record) {
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
import android.app.Dialog;
-import android.car.user.CarUserManagerHelper;
import android.content.Context;
import android.content.DialogInterface;
import android.content.pm.UserInfo;
import androidx.car.widget.PagedListView;
import com.android.internal.util.UserIcons;
+import com.android.settingslib.users.UserManagerHelper;
import com.android.systemui.R;
import com.android.systemui.statusbar.phone.SystemUIDialog;
* One of the uses of this is for the lock screen in auto.
*/
public class UserGridRecyclerView extends PagedListView implements
- CarUserManagerHelper.OnUsersUpdateListener {
+ UserManagerHelper.OnUsersUpdateListener {
private UserSelectionListener mUserSelectionListener;
private UserAdapter mAdapter;
- private CarUserManagerHelper mCarUserManagerHelper;
+ private UserManagerHelper mUserManagerHelper;
private Context mContext;
public UserGridRecyclerView(Context context, AttributeSet attrs) {
super(context, attrs);
mContext = context;
- mCarUserManagerHelper = new CarUserManagerHelper(mContext);
+ mUserManagerHelper = new UserManagerHelper(mContext);
}
/**
@Override
public void onFinishInflate() {
super.onFinishInflate();
- mCarUserManagerHelper.registerOnUsersUpdateListener(this);
+ mUserManagerHelper.registerOnUsersUpdateListener(this);
}
/**
@Override
public void onDetachedFromWindow() {
super.onDetachedFromWindow();
- mCarUserManagerHelper.unregisterOnUsersUpdateListener();
+ mUserManagerHelper.unregisterOnUsersUpdateListener();
}
/**
* @return the adapter
*/
public void buildAdapter() {
- List<UserRecord> userRecords = createUserRecords(mCarUserManagerHelper
- .getAllUsers());
+ List<UserRecord> userRecords = createUserRecords(mUserManagerHelper
+ .getAllUsersExcludesSystemUser());
mAdapter = new UserAdapter(mContext, userRecords);
super.setAdapter(mAdapter);
}
continue;
}
boolean isForeground =
- mCarUserManagerHelper.getCurrentForegroundUserId() == userInfo.id;
+ mUserManagerHelper.getForegroundUserId() == userInfo.id;
UserRecord record = new UserRecord(userInfo, false /* isStartGuestSession */,
false /* isAddUser */, isForeground);
userRecords.add(record);
}
// Add guest user record if the foreground user is not a guest
- if (!mCarUserManagerHelper.isForegroundUserGuest()) {
+ if (!mUserManagerHelper.foregroundUserIsGuestUser()) {
userRecords.add(addGuestUserRecord());
}
// Add add user record if the foreground user can add users
- if (mCarUserManagerHelper.canForegroundUserAddUsers()) {
+ if (mUserManagerHelper.foregroundUserCanAddUsers()) {
userRecords.add(addUserRecord());
}
@Override
public void onUsersUpdate() {
mAdapter.clearUsers();
- mAdapter.updateUsers(createUserRecords(mCarUserManagerHelper.getAllUsers()));
+ mAdapter.updateUsers(createUserRecords(mUserManagerHelper.getAllUsersExcludesSystemUser()));
mAdapter.notifyDataSetChanged();
}
// If the user selects Guest, start the guest session.
if (userRecord.mIsStartGuestSession) {
- mCarUserManagerHelper.startNewGuestSession(mGuestName);
+ mUserManagerHelper.startNewGuestSession(mGuestName);
return;
}
return;
}
// If the user doesn't want to be a guest or add a user, switch to the user selected
- mCarUserManagerHelper.switchToUser(userRecord.mInfo);
+ mUserManagerHelper.switchToUser(userRecord.mInfo);
});
}
private Bitmap getUserRecordIcon(UserRecord userRecord) {
if (userRecord.mIsStartGuestSession) {
- return mCarUserManagerHelper.getGuestDefaultIcon();
+ return mUserManagerHelper.getGuestDefaultIcon();
}
if (userRecord.mIsAddUser) {
.getDrawable(R.drawable.car_add_circle_round));
}
- return mCarUserManagerHelper.getUserIcon(userRecord.mInfo);
+ return mUserManagerHelper.getUserIcon(userRecord.mInfo);
}
@Override
@Override
protected UserInfo doInBackground(String... userNames) {
- // Default to create a non admin user for now. Need to add logic
- // for user to choose whether they want to create an admin or non-admin
- // user later.
- return mCarUserManagerHelper.createNewNonAdminUser(userNames[0]);
+ return mUserManagerHelper.createNewUser(userNames[0]);
}
@Override
@Override
protected void onPostExecute(UserInfo user) {
if (user != null) {
- mCarUserManagerHelper.switchToUser(user);
+ mUserManagerHelper.switchToUser(user);
}
}
}