diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2018-08-09 10:19:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-09 10:19:25 +0200 |
| commit | 74057ec222be05ee361a9adb227e6b8b388f4144 (patch) | |
| tree | 2cb6a6893ac998abd0c35d67158d451b4c896048 /Source/Android/app/src/main/java | |
| parent | bfbf9ed2ee969a29703eb7d302306f477a12d122 (diff) | |
| parent | 58aa6b99056f6b282d053891fe22893277342989 (diff) | |
Merge pull request #7303 from zackhow/exitemumenu
Android: Add exit to phone emu menu
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java | 5 | ||||
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/TvUtil.java | 5 |
2 files changed, 9 insertions, 1 deletions
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 index ab2f4fefac..3d7b9e4605 100644 --- 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.ControllerMappingHelper; 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 final class EmulationActivity extends AppCompatActivity 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 index d13cace229..a07b00e456 100644 --- 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.app.job.JobScheduler; 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 @@ public class TvUtil } return subs; } + public static Boolean isLeanback(Context context) + { + return(context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK)); + } } |