From f06fc78814dbc1a30a85c226fd8a9801dfdd34a0 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sun, 26 May 2013 22:29:40 -0500
Subject: [PATCH] [Android] Properly open the navigation drawer when pressing
 menu or back in the game list.

---
 Source/Android/AndroidManifest.xml            |  4 +--
 .../dolphinemu/dolphinemu/GameListView.java   | 35 ++++++++-----------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index d66ce154e2..adf52eb360 100644
--- 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
index ad2df58fa3..314e8e0ae5 100644
--- 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.Intent;
 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 class GameListView extends ListActivity {
     	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;
+	}
 }