Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always displays an option for starting a guest session in the full screen switcher."

Browse Source
This commit is contained in:
Jovana Knezevic
2018-08-07 05:40:49 +00:00
committed by Android (Google) Code Review
parent 80c65f4314 2d26ae3cc7
commit 8d6250528c
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/values/strings_car.xml
View File

@@ -19,7 +19,9 @@
<resources>
<!-- Name of Guest Profile. [CHAR LIMIT=30] -->
<string name="car_guest">Guest</string>
<!-- Name of Add User Profile. [CHAR LIMIT=30] -->
<!-- Title for button that starts a guest session. [CHAR LIMIT=30] -->
<string name="start_guest_session">Guest</string>
<!-- Title for button that adds a new user. [CHAR LIMIT=30] -->
<string name="car_add_user">Add User</string>
<!-- Default name of the new user created. [CHAR LIMIT=30] -->
<string name="car_new_user">New User</string>

3
packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java
View File

@@ -101,7 +101,8 @@ public class FullscreenUserSwitcher {
hideUserGrid();
}
if (record.mIsForeground) {
if (record.mIsForeground || (record.mIsStartGuestSession
&& mUserManagerHelper.foregroundUserIsGuestUser())) {
dismissKeyguard();
return;
}

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

@@ -109,14 +109,12 @@ public class UserGridRecyclerView extends PagedListView implements
userRecords.add(record);
}
// Add guest user record if the foreground user is not a guest
if (!mUserManagerHelper.foregroundUserIsGuestUser()) {
userRecords.add(addGuestUserRecord());
}
// Add button for starting guest session.
userRecords.add(createStartGuestUserRecord());
// Add add user record if the foreground user can add users
if (mUserManagerHelper.foregroundUserCanAddUsers()) {
userRecords.add(addUserRecord());
userRecords.add(createAddUserRecord());
}
return userRecords;
@@ -125,17 +123,17 @@ public class UserGridRecyclerView extends PagedListView implements
/**
* Create guest user record
*/
private UserRecord addGuestUserRecord() {
private UserRecord createStartGuestUserRecord() {
UserInfo userInfo = new UserInfo();
userInfo.name = mContext.getString(R.string.car_guest);
return new UserRecord(userInfo, true /* isStartGuestSession */,
false /* isAddUser */, false /* isForeground */);
userInfo.name = mContext.getString(R.string.start_guest_session);
return new UserRecord(userInfo, true /* isStartGuestSession */, false /* isAddUser */,
false /* isForeground */);
}
/**
* Create add user record
*/
private UserRecord addUserRecord() {
private UserRecord createAddUserRecord() {
UserInfo userInfo = new UserInfo();
userInfo.name = mContext.getString(R.string.car_add_user);
return new UserRecord(userInfo, false /* isStartGuestSession */,
@@ -210,8 +208,6 @@ public class UserGridRecyclerView extends PagedListView implements
return;
}
// If the user selects Guest, start the guest session.
if (userRecord.mIsStartGuestSession) {
notifyUserSelected(userRecord);
mUserManagerHelper.startNewGuestSession(mGuestName);