Skip to content
Sign up
This repository

public / dolphin Octocat-spinner-32

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

[Android] Tidy up the dialog buttons that don't do anything.
  • Loading branch information...
commit 4591464486d696a300cc914f6c2a3cce8af2d666 2 parents 8863eb0 + 932e3c1
Pierre Bourdon authored

Showing 2 changed files with 2 additions and 11 deletions. Show Diff Stats Hide Diff Stats

  1. 7  Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
  2. 6  Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
7  Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
View 
@@ -255,18 +255,13 @@ public boolean onMenuItemSelected(int itemId, MenuItem item)
255 255 
 				AlertDialog.Builder builder = new AlertDialog.Builder(this);
256 256 
 				builder.setTitle(getString(R.string.overlay_exit_emulation));
257 257 
 				builder.setMessage(R.string.overlay_exit_emulation_confirm);
  258 
+				builder.setNegativeButton(R.string.no, null);
258 259 
 				builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
259 260 
 					public void onClick(DialogInterface dialog, int which)
260 261 
 					{
261 262 
 						finish();
262 263 
 					}
263 264 
 				});
264   
-				builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
265   
-					public void onClick(DialogInterface dialog, int which)
266   
-					{
267   
-						// Do nothing. Just makes the No button appear.
268   
-					}
269   
-				});
270 265 
 				builder.show();
271 266 
 				return true;
272 267 
 			}
6  Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
View 
@@ -107,11 +107,7 @@ else if (preference.getString(key, "Software Renderer").equals("OGL"))
107 107 
 							AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
108 108 
 							builder.setTitle(R.string.device_compat_warning);
109 109 
 							builder.setMessage(R.string.device_gles3compat_warning_msg);
110   
-							builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
111   
-								public void onClick(DialogInterface dialog, int which) {
112   
-									// Do Nothing. Just create the Yes button
113   
-								}
114   
-							});
  110 
+							builder.setPositiveButton(R.string.yes, null);
115 111 
 							builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
116 112 
 								public void onClick(DialogInterface dialog, int which)
117 113 
 								{

0 notes on commit 4591464

Please sign in to comment.
Something went wrong with that request. Please try again.