bugfix: Pre-Honeycomb devices can exit input map activity.

As a side benefit, makes users aware of the other items in the menu.
wupeka · Jan 21, 2013 · 2d9c808 · 2d9c808
1 parent 1b285a1
commit 2d9c808
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/res/menu/input_map_activity.xml b/res/menu/input_map_activity.xml
@@ -10,5 +10,8 @@
     <item
         android:id="@+id/menuItem_controllerDiagnostics"
         android:title="@string/actionControllerDiagnostics_title"/>
+    <item
+        android:id="@+id/menuItem_exit"
+        android:title="@string/menuItem_exit"/>
 
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -21,7 +21,7 @@
 <resources>
 
     <!-- ************************************************************************** -->
-    <!-- In-Game Strings -->
+    <!-- Menu Strings -->
     <!-- ************************************************************************** -->
 
     <!-- In-Game Menu -->
@@ -35,6 +35,9 @@
     <string name="ingameSetIme_title">Change IME</string>
     <string name="ingameMainMenu_title">Main menu</string>
 
+    <!-- Input Mapping Activity -->
+    <string name="menuItem_exit">Exit</string>
+
     <!-- ************************************************************************** -->
     <!-- Toast Messages                                                             -->
     <!-- Developers: Follow punctuation and grammar as shown below                  -->

diff --git a/src/paulscode/android/mupen64plusae/input/InputMapActivity.java b/src/paulscode/android/mupen64plusae/input/InputMapActivity.java
@@ -199,6 +199,9 @@ public boolean onOptionsItemSelected( MenuItem item )
             case R.id.menuItem_controllerDiagnostics:
                 startActivity( new Intent( this, DiagnosticActivity.class ) );
                 break;
+            case R.id.menuItem_exit:
+                finish();
+                break;
             default:
                 return false;
         }