Citra-emu/citra-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly handle button_text for android

Browse Source
This commit is contained in:
SutandoTsukai181 2020-06-08 21:17:40 +03:00 committed by xperia64
parent 478fad95f7
commit 7cda537935
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/android/app/src/main/java/org/citra/citra_emu/applets/SoftwareKeyboard.java
View File

@ -131,21 +131,21 @@ public final class SoftwareKeyboard {
switch (config.button_config) { switch (config.button_config) {
case ButtonConfig.Triple: { case ButtonConfig.Triple: {
final String text = config.button_text == null final String text = config.button_text[1].isEmpty()
? emulationActivity.getString(R.string.i_forgot) ? emulationActivity.getString(R.string.i_forgot)
: config.button_text[1]; : config.button_text[1];
builder.setNeutralButton(text, null); builder.setNeutralButton(text, null);
} }
// fallthrough // fallthrough
case ButtonConfig.Dual: { case ButtonConfig.Dual: {
final String text = config.button_text == null final String text = config.button_text[0].isEmpty()
? emulationActivity.getString(android.R.string.cancel) ? emulationActivity.getString(android.R.string.cancel)
: config.button_text[0]; : config.button_text[0];
builder.setNegativeButton(text, null); builder.setNegativeButton(text, null);
} }
// fallthrough // fallthrough
case ButtonConfig.Single: { case ButtonConfig.Single: {
final String text = config.button_text == null final String text = config.button_text[2].isEmpty()
? emulationActivity.getString(android.R.string.ok) ? emulationActivity.getString(android.R.string.ok)
: config.button_text[2]; : config.button_text[2];
builder.setPositiveButton(text, null); builder.setPositiveButton(text, null);