Merge pull request #7303 from zackhow/exitemumenu

Android: Add exit to phone emu menu
dolphin-emu · Aug 9, 2018 · 74057ec · 74057ec
2 parents bfbf9ed + 58aa6b9
commit 74057ec
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
@@ -45,6 +45,7 @@
 import org.dolphinemu.dolphinemu.utils.FileBrowserHelper;
 import org.dolphinemu.dolphinemu.utils.Java_GCAdapter;
 import org.dolphinemu.dolphinemu.utils.Java_WiimoteAdapter;
+import org.dolphinemu.dolphinemu.utils.TvUtil;
 
 import java.lang.annotation.Retention;
 import java.util.List;
@@ -589,7 +590,9 @@ public void handleMenuAction(@MenuAction int menuAction)
 				return;
 
 			case MENU_ACTION_EXIT:
-				toggleMenu();  // Hide the menu (it will be showing since we just clicked it)
+				// ATV menu is built using a fragment, this will pop that fragment before emulation ends.
+				if(TvUtil.isLeanback(getApplicationContext()))
+					toggleMenu();  // Hide the menu (it will be showing since we just clicked it)
 				mEmulationFragment.stopEmulation();
 				exitWithAnimation();
 				return;

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/TvUtil.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/TvUtil.java
@@ -6,6 +6,7 @@
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@@ -293,4 +294,8 @@ private static List<HomeScreenChannel> createPlatformSubscriptions()
 		}
 		return subs;
 	}
+	public static Boolean isLeanback(Context context)
+	{
+		return(context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK));
+	}
 }
diff --git a/Source/Android/app/src/main/res/menu/menu_emulation.xml b/Source/Android/app/src/main/res/menu/menu_emulation.xml
@@ -106,4 +106,8 @@
         app:showAsAction="never"
         android:title="@string/emulation_change_disc"/>
 
+    <item
+        android:id="@+id/menu_exit"
+        app:showAsAction="never"
+        android:title="@string/emulation_exit"/>
 </menu>