[Android] Properly open the navigation drawer when pressing menu or b…

…ack in the game list.
dolphin-emu · May 27, 2013 · f06fc78 · f06fc78
1 parent 0bd8aaf
commit f06fc78
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 23 deletions.
diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.dolphinemu.dolphinemu"
-    android:versionCode="3"
-    android:versionName="0.3" >
+    android:versionCode="4"
+    android:versionName="0.4" >
 
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
 

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
@@ -6,7 +6,7 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.view.MenuItem;
+import android.view.KeyEvent;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
@@ -205,25 +205,18 @@ public void setContentView(int layoutResID) {
     	mDrawer.setContentView(layoutResID);
         onContentChanged();
     }
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-            	mDrawer.toggleMenu();
-                return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void onBackPressed() {
-        final int drawerState = mDrawer.getDrawerState();
-        if (drawerState == MenuDrawer.STATE_OPEN || drawerState == MenuDrawer.STATE_OPENING) {
-        	mDrawer.closeMenu();
-            return;
-        }
 
-        super.onBackPressed();
-    }
+	@Override
+	public boolean onKeyUp(int keyCode, KeyEvent event) {
+		if (event.getAction() == KeyEvent.KEYCODE_MENU|| event.getAction() == KeyEvent.KEYCODE_BACK) {
+			final int drawerState = mDrawer.getDrawerState();
+			if (drawerState == MenuDrawer.STATE_OPEN || drawerState == MenuDrawer.STATE_OPENING) {
+				mDrawer.closeMenu();
+				return true;
+			}
+			mDrawer.openMenu();
+			return true;
+		}
+		return false;
+	}
 }