Permalink
Browse files

Android: Add exit to phone emu menu

Some phones that have capacitive nav bar buttons disable those buttons while in emulation. This gives those devices a way to exit
  • Loading branch information...
zackhow committed Aug 6, 2018
1 parent 46fe6dc commit 58aa6b99056f6b282d053891fe22893277342989
@@ -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;
@@ -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 int getJobIdForChannelId(long channelId)
}
return subs;
}
public static Boolean isLeanback(Context context)
{
return(context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK));
}
}
@@ -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>

0 comments on commit 58aa6b9

Please sign in to comment.