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

[Android] Add be able to get in to settings from in game

This commit is contained in:
zilmar 2016-08-11 20:21:14 +10:00
parent cd2ce7db47
commit 4e22e23f97
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Android/res/menu/game_activity.xml
View File

@ -28,6 +28,9 @@
</group> </group>
</menu> </menu>
</item> </item>
<item
android:id="@+id/menuItem_settings"
android:title="@string/menuItem_settings"/>
<item <item
android:id="@+id/menuItem_pause" android:id="@+id/menuItem_pause"
android:title="@string/menuItem_pause"/> android:title="@string/menuItem_pause"/>

6
Android/src/emu/project64/game/GameMenuHandler.java
View File

@ -18,8 +18,10 @@ import emu.project64.R;
import emu.project64.jni.NativeExports; import emu.project64.jni.NativeExports;
import emu.project64.jni.SettingsID; import emu.project64.jni.SettingsID;
import emu.project64.jni.SystemEvent; import emu.project64.jni.SystemEvent;
import emu.project64.settings.SettingsActivity;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.content.Intent;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@ -142,6 +144,10 @@ public class GameMenuHandler implements PopupMenu.OnMenuItemClickListener, Popup
mLifecycleHandler.AutoSave(); mLifecycleHandler.AutoSave();
NativeExports.CloseSystem(); NativeExports.CloseSystem();
break; break;
case R.id.menuItem_settings:
Intent SettingsIntent = new Intent(mActivity, SettingsActivity.class);
mActivity.startActivity( SettingsIntent );
return true;
} }
return false; return false;
} }