ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #154 from lioncash/android-dlg-cleanup 

[Android] Tidy up the dialog buttons that don't do anything.
This commit is contained in:
Pierre Bourdon 2014-03-10 09:50:47 +01:00
parent 8863eb0671 932e3c1db2
commit 4591464486
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
View File

@ -255,18 +255,13 @@ public final class EmulationActivity extends Activity
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getString(R.string.overlay_exit_emulation)); builder.setTitle(getString(R.string.overlay_exit_emulation));
builder.setMessage(R.string.overlay_exit_emulation_confirm); builder.setMessage(R.string.overlay_exit_emulation_confirm);
builder.setNegativeButton(R.string.no, null);
builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) public void onClick(DialogInterface dialog, int which)
{ {
finish(); 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(); builder.show();
return true; return true;
} }

6
Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
View File

@ -107,11 +107,7 @@ public final class VideoSettingsFragment extends PreferenceFragment
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle(R.string.device_compat_warning); builder.setTitle(R.string.device_compat_warning);
builder.setMessage(R.string.device_gles3compat_warning_msg); builder.setMessage(R.string.device_gles3compat_warning_msg);
builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { builder.setPositiveButton(R.string.yes, null);
public void onClick(DialogInterface dialog, int which) {
// Do Nothing. Just create the Yes button
}
});
builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) public void onClick(DialogInterface dialog, int which)
{ {