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

Commit acb98ac1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents f77ad169 b713e27e
Loading
Loading
Loading
Loading
+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>
+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);