ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7303 from zackhow/exitemumenu 

Android:  Add exit to phone emu menu
This commit is contained in:
Markus Wick 2018-08-09 10:19:25 +02:00 committed by GitHub
parent bfbf9ed2ee 58aa6b9905
commit 74057ec222
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
View File

@ -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;

5
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/TvUtil.java
View File

@ -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));
}
}

4
Source/Android/app/src/main/res/menu/menu_emulation.xml
View File

@ -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>