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 #7392 from weihuoya/android-menu-fx 

Menu show action fx for android
This commit is contained in:
JosJuice 2018-09-26 19:54:36 +02:00 committed by GitHub
parent bcb5a6f0ed c062258719
commit 4a7715927e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,26 +5,26 @@
<item <item
android:id="@+id/menu_emulation_screenshot" android:id="@+id/menu_emulation_screenshot"
android:showAsAction="ifRoom" app:showAsAction="ifRoom"
android:icon="@drawable/ic_screenshot" android:icon="@drawable/ic_screenshot"
android:title="@string/emulation_screenshot"/> android:title="@string/emulation_screenshot"/>
<item <item
android:id="@+id/menu_quicksave" android:id="@+id/menu_quicksave"
android:showAsAction="ifRoom" app:showAsAction="ifRoom"
android:icon="@drawable/ic_quicksave" android:icon="@drawable/ic_quicksave"
android:title="@string/emulation_quicksave"/> android:title="@string/emulation_quicksave"/>
<item <item
android:id="@+id/menu_quickload" android:id="@+id/menu_quickload"
android:showAsAction="ifRoom" app:showAsAction="ifRoom"
android:icon="@drawable/ic_quickload" android:icon="@drawable/ic_quickload"
android:title="@string/emulation_quickload"/> android:title="@string/emulation_quickload"/>
<!-- Save State Slots --> <!-- Save State Slots -->
<item <item
android:id="@+id/menu_emulation_save_root" android:id="@+id/menu_emulation_save_root"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/emulation_savestate"> android:title="@string/emulation_savestate">
<menu> <menu>
<item <item
@ -52,7 +52,7 @@
<!-- Load State Slots --> <!-- Load State Slots -->
<item <item
android:id="@+id/menu_emulation_load_root" android:id="@+id/menu_emulation_load_root"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/emulation_loadstate"> android:title="@string/emulation_loadstate">
<menu> <menu>
<item <item
@ -79,7 +79,7 @@
<item <item
android:id="@+id/menu_emulation_configure_controls" android:id="@+id/menu_emulation_configure_controls"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/emulation_configure_controls"> android:title="@string/emulation_configure_controls">
<menu> <menu>
<item <item

13
Source/Android/app/src/main/res/menu/menu_emulation_wii.xml
View File

@ -1,29 +1,30 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context="org.dolphinemu.dolphinemu.activities.EmulationActivity"> tools:context="org.dolphinemu.dolphinemu.activities.EmulationActivity">
<item <item
android:id="@+id/menu_emulation_screenshot" android:id="@+id/menu_emulation_screenshot"
android:showAsAction="ifRoom" app:showAsAction="ifRoom"
android:icon="@drawable/ic_screenshot" android:icon="@drawable/ic_screenshot"
android:title="@string/emulation_screenshot"/> android:title="@string/emulation_screenshot"/>
<item <item
android:id="@+id/menu_quicksave" android:id="@+id/menu_quicksave"
android:showAsAction="ifRoom" app:showAsAction="ifRoom"
android:icon="@drawable/ic_quicksave" android:icon="@drawable/ic_quicksave"
android:title="@string/emulation_quicksave"/> android:title="@string/emulation_quicksave"/>
<item <item
android:id="@+id/menu_quickload" android:id="@+id/menu_quickload"
android:showAsAction="ifRoom" app:showAsAction="ifRoom"
android:icon="@drawable/ic_quickload" android:icon="@drawable/ic_quickload"
android:title="@string/emulation_quickload"/> android:title="@string/emulation_quickload"/>
<!-- Save State Slots --> <!-- Save State Slots -->
<item <item
android:id="@+id/menu_emulation_save_root" android:id="@+id/menu_emulation_save_root"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/emulation_savestate"> android:title="@string/emulation_savestate">
<menu> <menu>
<item <item
@ -51,7 +52,7 @@
<!-- Load State Slots --> <!-- Load State Slots -->
<item <item
android:id="@+id/menu_emulation_load_root" android:id="@+id/menu_emulation_load_root"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/emulation_loadstate"> android:title="@string/emulation_loadstate">
<menu> <menu>
<item <item
@ -78,7 +79,7 @@
<item <item
android:id="@+id/menu_emulation_configure_controls" android:id="@+id/menu_emulation_configure_controls"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/emulation_configure_controls"> android:title="@string/emulation_configure_controls">
<menu> <menu>
<item <item