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

Commit 7376a44b authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Rephrase the Exit guest action and dialog text" into lmp-dev

parents 6825368d e5b274ac

packages/SystemUI/res/values/strings.xml

+5 −2
Original line number Diff line number Diff line
@@ -707,10 +707,13 @@ 
    <string name="guest_exit_guest">Remove guest</string>



    <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->

    <string name="guest_exit_guest_dialog_title">Exiting 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">Exiting the guest session will remove local data.</string>

    <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 −2
Original line number Diff line number Diff line
@@ -508,9 +508,9 @@ public class UserSwitcherController { 
            setTitle(R.string.guest_exit_guest_dialog_title);

            setMessage(context.getString(R.string.guest_exit_guest_dialog_message));

            setButton(DialogInterface.BUTTON_NEGATIVE,

                    context.getString(android.R.string.no), this);

                    context.getString(android.R.string.cancel), this);

            setButton(DialogInterface.BUTTON_POSITIVE,

                    context.getString(android.R.string.yes), this);

                    context.getString(R.string.guest_exit_guest_dialog_remove), this);

            setCanceledOnTouchOutside(false);

            mGuestId = guestId;

        }