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

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

Merge "Update strings for guest removal affordance and dialog" into lmp-dev

parents 081a9162 94c0181c
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -5257,11 +5257,13 @@
    <!-- Title for Guest user [CHAR LIMIT=35] -->
    <string name="user_guest">Guest</string>
    <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
    <string name="user_exit_guest_title">Exit guest</string>
    <string name="user_exit_guest_title">Remove guest</string>
    <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
    <string name="user_exit_guest_confirm_title">Exiting guest session?</string>
    <string name="user_exit_guest_confirm_title">Remove guest?</string>
    <!-- Message to user to confirm exiting guest. [CHAR LIMIT=none] -->
    <string name="user_exit_guest_confirm_message">Ending the guest session will remove local data.</string>
    <string name="user_exit_guest_confirm_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="user_exit_guest_dialog_remove">Remove</string>

    <!-- Title of preference to enable calling[CHAR LIMIT=40] -->
    <string name="user_enable_calling">Allow phone calls</string>
+2 −2
Original line number Diff line number Diff line
@@ -630,14 +630,14 @@ public class UserSettings extends SettingsPreferenceFragment
                Dialog dlg = new AlertDialog.Builder(context)
                        .setTitle(R.string.user_exit_guest_confirm_title)
                        .setMessage(R.string.user_exit_guest_confirm_message)
                        .setPositiveButton(android.R.string.yes,
                        .setPositiveButton(R.string.user_exit_guest_dialog_remove,
                                new DialogInterface.OnClickListener() {
                                    @Override
                                    public void onClick(DialogInterface dialog, int which) {
                                        exitGuest();
                                    }
                                })
                        .setNegativeButton(android.R.string.no, null)
                        .setNegativeButton(android.R.string.cancel, null)
                        .create();
                return dlg;
            }