From 781913f23069139a81612ca9cbc481b99d35adc5 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Fri, 30 Aug 2019 18:25:41 -0400
Subject: [PATCH] android: frontend: Use android builtin ok/yes/no/cancel
 strings where possible.

---
 .../citra/citra_android/NativeLibrary.java    |  6 ++---
 .../activities/EmulationActivity.java         | 23 ++++++-------------
 .../ui/settings/SettingsAdapter.java          | 10 ++++----
 .../app/src/main/res/values/strings.xml       |  4 ----
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/src/android/app/src/main/java/org/citra/citra_android/NativeLibrary.java b/src/android/app/src/main/java/org/citra/citra_android/NativeLibrary.java
index 510b452ec..f2d05a80a 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/NativeLibrary.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/NativeLibrary.java
@@ -307,7 +307,7 @@ public final class NativeLibrary {
             if (!yesNo) {
                 builder
                         .setCancelable(false)
-                        .setPositiveButton("OK", (dialog, whichButton) ->
+                        .setPositiveButton(android.R.string.ok, (dialog, whichButton) ->
                         {
                             dialog.dismiss();
                             synchronized (lock) {
@@ -318,7 +318,7 @@ public final class NativeLibrary {
                 alertResult = false;
 
                 builder
-                        .setPositiveButton("Yes", (dialog, whichButton) ->
+                        .setPositiveButton(android.R.string.yes, (dialog, whichButton) ->
                         {
                             alertResult = true;
                             dialog.dismiss();
@@ -326,7 +326,7 @@ public final class NativeLibrary {
                                 lock.notify();
                             }
                         })
-                        .setNegativeButton("No", (dialog, whichButton) ->
+                        .setNegativeButton(android.R.string.no, (dialog, whichButton) ->
                         {
                             alertResult = false;
                             dialog.dismiss();
diff --git a/src/android/app/src/main/java/org/citra/citra_android/activities/EmulationActivity.java b/src/android/app/src/main/java/org/citra/citra_android/activities/EmulationActivity.java
index b071a3a6d..581f8583e 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/activities/EmulationActivity.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/activities/EmulationActivity.java
@@ -252,12 +252,12 @@ public final class EmulationActivity extends AppCompatActivity {
             new AlertDialog.Builder(this)
                     .setTitle(R.string.emulation_close_game)
                     .setMessage(R.string.emulation_close_game_message)
-                    .setPositiveButton(R.string.yes, (dialogInterface, i) ->
+                    .setPositiveButton(android.R.string.yes, (dialogInterface, i) ->
                     {
                         mEmulationFragment.stopEmulation();
                         exitWithAnimation();
                     })
-                    .setNegativeButton(R.string.cancel, (dialogInterface, i) ->
+                    .setNegativeButton(android.R.string.cancel, (dialogInterface, i) ->
                     {
                     }).setOnDismissListener(dialogInterface ->
                     {
@@ -507,7 +507,7 @@ public final class EmulationActivity extends AppCompatActivity {
                 (dialog, indexSelected, isChecked) -> editor
                         .putBoolean("buttonToggle" + indexSelected, isChecked));
 
-        builder.setPositiveButton(getString(R.string.ok), (dialogInterface, i) ->
+        builder.setPositiveButton(android.R.string.ok, (dialogInterface, i) ->
         {
             editor.apply();
 
@@ -529,17 +529,13 @@ public final class EmulationActivity extends AppCompatActivity {
         seekbar.setMax(150);
         seekbar.setProgress(mPreferences.getInt("controlScale", 50));
         seekbar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-            public void onStartTrackingTouch(SeekBar seekBar) {
-                // Do nothing
-            }
+            public void onStartTrackingTouch(SeekBar seekBar) { }
 
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
                 value.setText(String.valueOf(progress + 50));
             }
 
-            public void onStopTrackingTouch(SeekBar seekBar) {
-                // Do nothing
-            }
+            public void onStopTrackingTouch(SeekBar seekBar) { }
         });
 
         value.setText(String.valueOf(seekbar.getProgress() + 50));
@@ -570,13 +566,8 @@ public final class EmulationActivity extends AppCompatActivity {
     private void resetOverlay() {
         new AlertDialog.Builder(this)
                 .setTitle(getString(R.string.emulation_touch_overlay_reset))
-                .setPositiveButton(R.string.yes, (dialogInterface, i) ->
-                {
-                    mEmulationFragment.resetInputOverlay();
-                })
-                .setNegativeButton(R.string.cancel, (dialogInterface, i) ->
-                {
-                })
+                .setPositiveButton(android.R.string.yes, (dialogInterface, i) -> mEmulationFragment.resetInputOverlay())
+                .setNegativeButton(android.R.string.cancel, (dialogInterface, i) -> { })
                 .create()
                 .show();
     }
diff --git a/src/android/app/src/main/java/org/citra/citra_android/ui/settings/SettingsAdapter.java b/src/android/app/src/main/java/org/citra/citra_android/ui/settings/SettingsAdapter.java
index 5eb89caa0..1b1ed67c8 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/ui/settings/SettingsAdapter.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/ui/settings/SettingsAdapter.java
@@ -205,8 +205,8 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
         };
 
         builder.setView(view);
-        builder.setPositiveButton(R.string.ok, ok);
-        builder.setNegativeButton(R.string.cancel, defaultCancelListener);
+        builder.setPositiveButton(android.R.string.ok, ok);
+        builder.setNegativeButton(android.R.string.cancel, defaultCancelListener);
         mDialog = builder.show();
     }
 
@@ -223,8 +223,8 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
 
         builder.setTitle(item.getNameId());
         builder.setView(view);
-        builder.setPositiveButton(R.string.ok, this);
-        builder.setNegativeButton(R.string.cancel, defaultCancelListener);
+        builder.setPositiveButton(android.R.string.ok, this);
+        builder.setNegativeButton(android.R.string.cancel, defaultCancelListener);
         builder.setNeutralButton(R.string.slider_default, (DialogInterface dialog, int which) -> {
             seekbar.setProgress(item.getDefaultValue());
             onClick(dialog, which);
@@ -262,7 +262,7 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
         }
 
         dialog.setMessage(String.format(mContext.getString(messageResId), mContext.getString(item.getNameId())));
-        dialog.setButton(AlertDialog.BUTTON_NEGATIVE, mContext.getString(R.string.cancel), this);
+        dialog.setButton(AlertDialog.BUTTON_NEGATIVE, mContext.getString(android.R.string.cancel), this);
         dialog.setButton(AlertDialog.BUTTON_NEUTRAL, mContext.getString(R.string.clear), (dialogInterface, i) ->
         {
             item.removeOldMapping();
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index e139e4d60..f6a0974df 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -75,10 +75,6 @@
     <string name="audio_stretch_description">Stretches audio to reduce stuttering. When enabled, increases audio latency and slightly reduces performance.</string>
 
     <!-- Miscellaneous -->
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Cancel</string>
     <string name="clear">Clear</string>
     <string name="disabled">Disabled</string>
     <string name="other">Other</string>