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

Commit 06fb6441 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use string resources for avatar picker button labels." into tm-dev am: acb98ac1 

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

Change-Id: I279df71bc364826a72af8630732bea8b6ddbaf77
parents dd98915e acb98ac1

packages/SettingsLib/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1293,6 +1293,8 @@ 
    <string name="cancel">Cancel</string>

    <!-- Button label for generic OK action [CHAR LIMIT=20] -->

    <string name="okay">OK</string>

    <!-- Button label for generic Done action, to be pressed when an action has been completed [CHAR LIMIT=20] -->

    <string name="done">Done</string>



    <!-- Label for the settings activity for controlling apps that can schedule alarms [CHAR LIMIT=30] -->

    <string name="alarms_and_reminders_label">Alarms and reminders</string>

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

+2 −2
Original line number Diff line number Diff line
@@ -106,13 +106,13 @@ public class AvatarPickerActivity extends Activity { 


        FooterButton secondaryButton =

                new FooterButton.Builder(this)

                        .setText("Cancel")

                        .setText(getString(android.R.string.cancel))

                        .setListener(view -> cancel())

                        .build();



        mDoneButton =

                new FooterButton.Builder(this)

                        .setText("Done")

                        .setText(getString(R.string.done))

                        .setListener(view -> mAdapter.returnSelectionResult())

                        .build();

        mDoneButton.setEnabled(false);