Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba1b08e7 authored by Peter Kalauskas's avatar Peter Kalauskas Committed by Automerger Merge Worker
Browse files

Merge "Revert "Update icons and text for guest user"" into sc-dev am: ef0cd104 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13554662

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia004a552cd398a04e94b4273223443f05c63f330
parents 46bf587a ef0cd104

packages/SettingsLib/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java

+1 −5
Original line number Diff line number Diff line
@@ -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;

                }

            } else {

                iconRes = R.drawable.ic_avatar_user;

            }

packages/SystemUI/src/com/android/systemui/tuner/TunerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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.