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

Commit d1b8fb44 authored by Tetiana Meronyk's avatar Tetiana Meronyk Committed by Android (Google) Code Review
Browse files

Merge "Update String resources used for buttons in EditUserInfoController" into main

parents 011ca093 17f1f8aa

packages/SettingsLib/src/com/android/settingslib/users/EditUserInfoController.java

+2 −2
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ public class EditUserInfoController { 
        dialogHelper

                .setTitle(R.string.user_info_settings_title)

                .addCustomView(content)

                .setPositiveButton(android.R.string.ok, view -> {

                .setPositiveButton(R.string.okay, view -> {

                    Drawable newUserIcon = mEditUserPhotoController != null

                            ? mEditUserPhotoController.getNewUserPhotoDrawable()

                            : null;
@@ -201,7 +201,7 @@ public class EditUserInfoController { 
                    }

                    dialogHelper.getDialog().dismiss();

                })

                .setBackButton(android.R.string.cancel, view -> {

                .setBackButton(R.string.cancel, view -> {

                    clear();

                    if (cancelCallback != null) {

                        cancelCallback.run();