Android: Add Quicksave/Load functionality, and cleanup in-game menu.

This commit is contained in:
sigmabeta committed 2015-06-20 12:34:03 -04:00
1 parent 1003d08d81
commit 92c954c463
20 files changed
+61 -128

No files matched your search

@@ -1,64 +0,0 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Enable/Disabe Input Overlay -->
<item
android:id="@+id/enableInputOverlay"
android:showAsAction="ifRoom"
android:title="@string/disable_input_overlay"/>
<!-- Save State Slots -->
<item
android:id="@+id/takeScreenshot"
android:showAsAction="ifRoom"
android:title="@string/overlay_screenshot"/>
<item
android:id="@+id/saveStateRoot"
android:showAsAction="never"
android:title="@string/overlay_savestate">
<menu>
<item android:id="@+id/saveSlot1"
android:title="@string/overlay_slot1"/>
<item android:id="@+id/saveSlot2"
android:title="@string/overlay_slot2"/>
<item android:id="@+id/saveSlot3"
android:title="@string/overlay_slot3"/>
<item android:id="@+id/saveSlot4"
android:title="@string/overlay_slot4"/>
<item android:id="@+id/saveSlot5"
android:title="@string/overlay_slot5"/>
</menu>
</item>
<!-- Load State Slots -->
<item
android:id="@+id/loadStateRoot"
android:showAsAction="never"
android:title="@string/overlay_loadstate">
<menu>
<item android:id="@+id/loadSlot1"
android:title="@string/overlay_slot1"/>
<item android:id="@+id/loadSlot2"
android:title="@string/overlay_slot2"/>
<item android:id="@+id/loadSlot3"
android:title="@string/overlay_slot3"/>
<item android:id="@+id/loadSlot4"
android:title="@string/overlay_slot4"/>
<item android:id="@+id/loadSlot5"
android:title="@string/overlay_slot5"/>
</menu>
</item>
<item
android:id="@+id/exitEmulation"
android:showAsAction="ifRoom"
android:title="@string/overlay_exit_emulation">
</item>
</menu>
@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/clearGameList"
android:title="@string/clear_game_list"
android:showAsAction="ifRoom|withText" />
</menu>
@@ -3,75 +3,87 @@
tools:context="org.dolphinemu.dolphinemu.activities.EmulationActivity">
<!-- Enable/Disabe Input Overlay -->
<item
android:id="@+id/enableInputOverlay"
android:id="@+id/menu_emulation_screenshot"
android:showAsAction="ifRoom"
android:icon="@drawable/ic_screenshot"
android:title="@string/overlay_screenshot"/>
<item
android:id="@+id/menu_quicksave"
android:showAsAction="ifRoom"
android:icon="@drawable/ic_quicksave"
android:title="@string/emulation_quicksave"
/>
<item
android:id="@+id/menu_quickload"
android:showAsAction="ifRoom"
android:icon="@drawable/ic_quickload"
android:title="@string/emulation_quickload"
/>
<!-- Enable/Disable Input Overlay -->
<item
android:id="@+id/menu_emulation_input_overlay"
android:showAsAction="never"
android:title="@string/emulation_toggle_input"/>
<!-- Save State Slots -->
<item
android:id="@+id/takeScreenshot"
android:showAsAction="ifRoom"
android:title="@string/overlay_screenshot"/>
<item
android:id="@+id/saveStateRoot"
android:id="@+id/menu_emulation_save_root"
android:showAsAction="never"
android:title="@string/overlay_savestate">
<menu>
<item
android:id="@+id/saveSlot1"
android:id="@+id/menu_emulation_save_1"
android:title="@string/overlay_slot1"/>
<item
android:id="@+id/saveSlot2"
android:id="@+id/menu_emulation_save_2"
android:title="@string/overlay_slot2"/>
<item
android:id="@+id/saveSlot3"
android:id="@+id/menu_emulation_save_3"
android:title="@string/overlay_slot3"/>
<item
android:id="@+id/saveSlot4"
android:id="@+id/menu_emulation_save_4"
android:title="@string/overlay_slot4"/>
<item
android:id="@+id/saveSlot5"
android:id="@+id/menu_emulation_save_5"
android:title="@string/overlay_slot5"/>
</menu>
</item>
<!-- Load State Slots -->
<item
android:id="@+id/loadStateRoot"
android:id="@+id/menu_emulation_load_root"
android:showAsAction="never"
android:title="@string/overlay_loadstate">
<menu>
<item
android:id="@+id/loadSlot1"
android:id="@+id/menu_emulation_load_1"
android:title="@string/overlay_slot1"/>
<item
android:id="@+id/loadSlot2"
android:id="@+id/menu_emulation_load_2"
android:title="@string/overlay_slot2"/>
<item
android:id="@+id/loadSlot3"
android:id="@+id/menu_emulation_load_3"
android:title="@string/overlay_slot3"/>
<item
android:id="@+id/loadSlot4"
android:id="@+id/menu_emulation_load_4"
android:title="@string/overlay_slot4"/>
<item
android:id="@+id/loadSlot5"
android:id="@+id/menu_emulation_load_5"
android:title="@string/overlay_slot5"/>
</menu>
</item>
<item
android:id="@+id/exitEmulation"
android:showAsAction="ifRoom"
android:title="@string/overlay_exit_emulation">
</item>
</menu>