diff --git a/android/bin/classes/com/retroarch/MainActivity.class b/android/bin/classes/com/retroarch/MainActivity.class index 33f0134ca2..d5fba4e868 100644 Binary files a/android/bin/classes/com/retroarch/MainActivity.class and b/android/bin/classes/com/retroarch/MainActivity.class differ diff --git a/android/bin/classes/com/retroarch/R$drawable.class b/android/bin/classes/com/retroarch/R$drawable.class index 9cf4ba1bc2..62036ee00a 100644 Binary files a/android/bin/classes/com/retroarch/R$drawable.class and b/android/bin/classes/com/retroarch/R$drawable.class differ diff --git a/android/bin/classes/com/retroarch/R$layout.class b/android/bin/classes/com/retroarch/R$layout.class index 9feb438dea..78c6034104 100644 Binary files a/android/bin/classes/com/retroarch/R$layout.class and b/android/bin/classes/com/retroarch/R$layout.class differ diff --git a/android/bin/classes/com/retroarch/R$string.class b/android/bin/classes/com/retroarch/R$string.class index 9838af76c9..e0ffa75cf2 100644 Binary files a/android/bin/classes/com/retroarch/R$string.class and b/android/bin/classes/com/retroarch/R$string.class differ diff --git a/android/gen/com/retroarch/R.java b/android/gen/com/retroarch/R.java index 4b7bc1bc03..083d090c3b 100644 --- a/android/gen/com/retroarch/R.java +++ b/android/gen/com/retroarch/R.java @@ -15,16 +15,18 @@ public final class R { public static final int ic_action_history=0x7f020001; public static final int ic_action_load=0x7f020002; public static final int ic_action_open=0x7f020003; - public static final int ic_action_save=0x7f020004; - public static final int ic_action_settings=0x7f020005; - public static final int ic_launcher=0x7f020006; + public static final int ic_action_quit=0x7f020004; + public static final int ic_action_save=0x7f020005; + public static final int ic_action_settings=0x7f020006; + public static final int ic_launcher=0x7f020007; } public static final class id { - public static final int close=0x7f060003; + public static final int close=0x7f060001; public static final int history=0x7f060004; - public static final int load=0x7f060001; + public static final int load=0x7f060002; public static final int open=0x7f060000; - public static final int save=0x7f060002; + public static final int quit=0x7f060006; + public static final int save=0x7f060003; public static final int settings=0x7f060005; } public static final class layout { diff --git a/android/res/drawable-hdpi/ic_action_quit.png b/android/res/drawable-hdpi/ic_action_quit.png new file mode 100644 index 0000000000..10dc28fcbb Binary files /dev/null and b/android/res/drawable-hdpi/ic_action_quit.png differ diff --git a/android/res/drawable-hdpi/ic_launcher.png b/android/res/drawable-hdpi/ic_launcher.png index 16db30ee10..ea7613b8c4 100644 Binary files a/android/res/drawable-hdpi/ic_launcher.png and b/android/res/drawable-hdpi/ic_launcher.png differ diff --git a/android/res/drawable-ldpi/ic_action_quit.png b/android/res/drawable-ldpi/ic_action_quit.png new file mode 100644 index 0000000000..203696e713 Binary files /dev/null and b/android/res/drawable-ldpi/ic_action_quit.png differ diff --git a/android/res/drawable-mdpi/ic_action_quit.png b/android/res/drawable-mdpi/ic_action_quit.png new file mode 100644 index 0000000000..369120e38c Binary files /dev/null and b/android/res/drawable-mdpi/ic_action_quit.png differ diff --git a/android/res/drawable-mdpi/ic_launcher.png b/android/res/drawable-mdpi/ic_launcher.png index b311ce1fd4..84f2bca830 100644 Binary files a/android/res/drawable-mdpi/ic_launcher.png and b/android/res/drawable-mdpi/ic_launcher.png differ diff --git a/android/res/drawable-xhdpi/ic_action_quit.png b/android/res/drawable-xhdpi/ic_action_quit.png new file mode 100644 index 0000000000..041de185be Binary files /dev/null and b/android/res/drawable-xhdpi/ic_action_quit.png differ diff --git a/android/res/drawable-xhdpi/ic_launcher.png b/android/res/drawable-xhdpi/ic_launcher.png index 97e0bd9756..a113106a99 100644 Binary files a/android/res/drawable-xhdpi/ic_launcher.png and b/android/res/drawable-xhdpi/ic_launcher.png differ diff --git a/android/res/menu/main_menu.xml b/android/res/menu/main_menu.xml index e6d0cc623f..bdf9374246 100644 --- a/android/res/menu/main_menu.xml +++ b/android/res/menu/main_menu.xml @@ -2,11 +2,12 @@
diff --git a/android/src/com/retroarch/MainActivity.java b/android/src/com/retroarch/MainActivity.java index 2a1f77b482..957f352602 100644 --- a/android/src/com/retroarch/MainActivity.java +++ b/android/src/com/retroarch/MainActivity.java @@ -1,5 +1,6 @@ package com.retroarch; +import android.app.ActionBar; import android.app.Activity; import android.content.Context; import android.view.Menu; @@ -31,9 +32,15 @@ public class MainActivity extends Activity public boolean onOptionsItemSelected(MenuItem item) { - Toast.makeText(this, "MenuItem " + item.getTitle() + " selected.", Toast.LENGTH_SHORT).show(); - - return true; + switch (item.getItemId()) + { + case R.id.quit: + android.os.Process.killProcess(android.os.Process.myPid()); + return true; + default: + Toast.makeText(this, "MenuItem " + item.getTitle() + " selected.", Toast.LENGTH_SHORT).show(); + return true; + } } @Override