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

Commit eebfefc0 authored by Anna Bauza's avatar Anna Bauza
Browse files

Fix "Remove Guest" option shows "Reset Guest" dialog 

If the guest user was not auto created, removing the user from settings message was wrongly worded. Small refactor to reuse the same wording in different modules has been done.

Bug: 225314166
Test: manual
Change-Id: Ib392c04b0f0e3d66c802729f4232d289fe5a80a5
parent a84dc9b8

packages/SettingsLib/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1434,6 +1434,8 @@ 
    <string name="guest_remove_guest_dialog_title">Remove guest?</string>

    <!-- Label for button in confirmation dialog when resetting guest user [CHAR LIMIT=35] -->

    <string name="guest_reset_guest_confirm_button">Reset</string>

    <!-- Label for button in confirmation dialog when removing guest session [CHAR LIMIT=35] -->

    <string name="guest_remove_guest_confirm_button">Remove</string>

    <!-- Status message indicating the device is in the process of resetting the guest user. [CHAR_LIMIT=NONE] -->

    <string name="guest_resetting">Resetting guest\u2026</string>

    <!-- An option in a photo selection dialog to take a new photo [CHAR LIMIT=50] -->

packages/SystemUI/res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -873,9 +873,6 @@ 
    <!-- 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">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

+2 −1
Original line number Diff line number Diff line
@@ -1155,7 +1155,8 @@ public class UserSwitcherController implements Dumpable { 
            setButton(DialogInterface.BUTTON_POSITIVE,

                    context.getString(mGuestUserAutoCreated

                            ? com.android.settingslib.R.string.guest_reset_guest_confirm_button

                            : R.string.guest_exit_guest_dialog_remove), this);

                            : com.android.settingslib.R.string.guest_remove_guest_confirm_button),

                    this);

            SystemUIDialog.setWindowOnTop(this, mKeyguardStateController.isShowing());

            setCanceledOnTouchOutside(false);

            mGuestId = guestId;