From 234e1f2ad2161cd8a78f9f68641415cfbb2a6b3f Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Thu, 18 Jul 2019 22:42:14 -0400
Subject: [PATCH] android: frontend: Fix settings slider cancel button.

---
 .../ui/settings/SettingsAdapter.java          | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

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 e7da7f837..608796b7a 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
@@ -149,6 +149,13 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
         mDialog = builder.show();
     }
 
+    DialogInterface.OnClickListener defaultCancelListener = new DialogInterface.OnClickListener() {
+        @Override
+        public void onClick(DialogInterface dialog, int which) {
+            closeDialog();
+        }
+    };
+
     public void onDateTimeClick(DateTimeSetting item) {
         mClickedItem = item;
 
@@ -188,15 +195,10 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
                 closeDialog();
             }
         };
-        DialogInterface.OnClickListener cancel = new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                closeDialog();
-            }
-        };
+
         builder.setView(view);
-        builder.setPositiveButton("Set", ok);
-        builder.setNegativeButton("Cancel", cancel);
+        builder.setPositiveButton(R.string.ok, ok);
+        builder.setNegativeButton(R.string.cancel, defaultCancelListener);
         mDialog = builder.show();
     }
 
@@ -211,7 +213,7 @@ 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, this);
+        builder.setNegativeButton(R.string.cancel, defaultCancelListener);
         mDialog = builder.show();
 
         mTextSliderValue = view.findViewById(R.id.text_value);