diff options
4 files changed, 5 insertions, 9 deletions
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 7556ace466f2..9823d4e22aeb 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -1380,7 +1380,7 @@ <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] --> <string name="guest_new_guest">Add guest</string> <!-- Label for exiting and removing the guest session in the user switcher [CHAR LIMIT=35] --> - <string name="guest_exit_guest">End guest session</string> + <string name="guest_exit_guest">Remove guest</string> <!-- Name for the guest user [CHAR LIMIT=35] --> <string name="guest_nickname">Guest</string> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 7c1c24bf280e..d997ca2fa4a4 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1116,13 +1116,13 @@ <string name="guest_exit_button">End guest session</string> <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] --> - <string name="guest_exit_guest_dialog_title">End guest session?</string> + <string name="guest_exit_guest_dialog_title">Remove guest?</string> <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] --> <string name="guest_exit_guest_dialog_message">All apps and data in this session will be deleted.</string> <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] --> - <string name="guest_exit_guest_dialog_remove">End session</string> + <string name="guest_exit_guest_dialog_remove">Remove</string> <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] --> <string name="guest_wipe_session_title">Welcome back, guest!</string> 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 1838391ce2ae..019ab479e28e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java @@ -680,11 +680,7 @@ public class UserSwitcherController implements Dumpable { if (item.isAddUser) { iconRes = R.drawable.ic_add_circle; } else if (item.isGuest) { - if (item.isCurrent) { - iconRes = R.drawable.ic_exit_to_app; - } else { - iconRes = R.drawable.ic_avatar_guest_user; - } + iconRes = R.drawable.ic_avatar_guest_user; } else { iconRes = R.drawable.ic_avatar_user; } diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java index 09335afc059c..b67574d1c4de 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java @@ -109,7 +109,7 @@ public abstract class TunerService { dialog.setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.cancel), (OnClickListener) null); dialog.setButton(DialogInterface.BUTTON_POSITIVE, - context.getString(R.string.qs_customize_remove), new OnClickListener() { + context.getString(R.string.guest_exit_guest_dialog_remove), new OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { // Tell the tuner (in main SysUI process) to clear all its settings. |