diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-03-10 09:50:47 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-03-10 09:50:47 +0100 |
| commit | 4591464486d696a300cc914f6c2a3cce8af2d666 (patch) | |
| tree | 5c357f1c94804ad9670b6ae120cd95c6051a4181 /Source/Android/src | |
| parent | 8863eb06710b741aca73a577d28846b27d7a7498 (diff) | |
| parent | 932e3c1db2e9914367d2743deb3c66f95e552db9 (diff) | |
Merge pull request #154 from lioncash/android-dlg-cleanup
[Android] Tidy up the dialog buttons that don't do anything.
Diffstat (limited to 'Source/Android/src')
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java | 7 | ||||
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java | 6 |
2 files changed, 2 insertions, 11 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java index 7f6896536c..cb13b9e2d6 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java @@ -255,18 +255,13 @@ public final class EmulationActivity extends Activity AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(getString(R.string.overlay_exit_emulation)); builder.setMessage(R.string.overlay_exit_emulation_confirm); + builder.setNegativeButton(R.string.no, null); builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { finish(); } }); - builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) - { - // Do nothing. Just makes the No button appear. - } - }); builder.show(); return true; } diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java index 5059fe9f39..94e411ca9e 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java @@ -107,11 +107,7 @@ public final class VideoSettingsFragment extends PreferenceFragment AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setTitle(R.string.device_compat_warning); builder.setMessage(R.string.device_gles3compat_warning_msg); - builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - // Do Nothing. Just create the Yes button - } - }); + builder.setPositiveButton(R.string.yes, null); builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { |