Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-14 07:23:25 +00:00
committed by Android (Google) Code Review
parent f77ad16906 b713e27e54
commit acb98ac19c
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/res/values/strings.xml
View File

@@ -1293,6 +1293,8 @@
<string name="cancel">Cancel</string> <string name="cancel">Cancel</string>
<!-- Button label for generic OK action [CHAR LIMIT=20] --> <!-- Button label for generic OK action [CHAR LIMIT=20] -->
<string name="okay">OK</string> <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] --> <!-- 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> <string name="alarms_and_reminders_label">Alarms and reminders</string>

4
packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java
View File

@@ -106,13 +106,13 @@ public class AvatarPickerActivity extends Activity {
FooterButton secondaryButton = FooterButton secondaryButton =
new FooterButton.Builder(this) new FooterButton.Builder(this)
.setText("Cancel") .setText(getString(android.R.string.cancel))
.setListener(view -> cancel()) .setListener(view -> cancel())
.build(); .build();
mDoneButton = mDoneButton =
new FooterButton.Builder(this) new FooterButton.Builder(this)
.setText("Done") .setText(getString(R.string.done))
.setListener(view -> mAdapter.returnSelectionResult()) .setListener(view -> mAdapter.returnSelectionResult())
.build(); .build();
mDoneButton.setEnabled(false); mDoneButton.setEnabled(false);