From 92c954c463f804c2c94718ad2090aae9130f003a Mon Sep 17 00:00:00 2001 From: sigmabeta Date: Sat, 20 Jun 2015 12:34:03 -0400 Subject: [PATCH] Android: Add Quicksave/Load functionality, and cleanup in-game menu. --- .../activities/EmulationActivity.java | 53 ++++++--------- .../main/res/drawable-hdpi/ic_quickload.png | Bin 0 -> 531 bytes .../main/res/drawable-hdpi/ic_quicksave.png | Bin 0 -> 341 bytes .../main/res/drawable-hdpi/ic_screenshot.png | Bin 0 -> 457 bytes .../main/res/drawable-mdpi/ic_quickload.png | Bin 0 -> 346 bytes .../main/res/drawable-mdpi/ic_quicksave.png | Bin 0 -> 257 bytes .../main/res/drawable-mdpi/ic_screenshot.png | Bin 0 -> 326 bytes .../main/res/drawable-xhdpi/ic_quickload.png | Bin 0 -> 637 bytes .../main/res/drawable-xhdpi/ic_quicksave.png | Bin 0 -> 359 bytes .../main/res/drawable-xhdpi/ic_screenshot.png | Bin 0 -> 534 bytes .../main/res/drawable-xxhdpi/ic_quickload.png | Bin 0 -> 875 bytes .../main/res/drawable-xxhdpi/ic_quicksave.png | Bin 0 -> 489 bytes .../res/drawable-xxhdpi/ic_screenshot.png | Bin 0 -> 781 bytes .../res/drawable-xxxhdpi/ic_quickload.png | Bin 0 -> 1148 bytes .../res/drawable-xxxhdpi/ic_quicksave.png | Bin 0 -> 747 bytes .../res/drawable-xxxhdpi/ic_screenshot.png | Bin 0 -> 1023 bytes .../src/main/res/menu/emuwindow_overlay.xml | 64 ------------------ .../app/src/main/res/menu/gamelist_menu.xml | 7 -- .../app/src/main/res/menu/menu_emulation.xml | 60 +++++++++------- .../app/src/main/res/values/strings.xml | 5 +- 20 files changed, 61 insertions(+), 128 deletions(-) create mode 100644 Source/Android/app/src/main/res/drawable-hdpi/ic_quickload.png create mode 100644 Source/Android/app/src/main/res/drawable-hdpi/ic_quicksave.png create mode 100644 Source/Android/app/src/main/res/drawable-hdpi/ic_screenshot.png create mode 100644 Source/Android/app/src/main/res/drawable-mdpi/ic_quickload.png create mode 100644 Source/Android/app/src/main/res/drawable-mdpi/ic_quicksave.png create mode 100644 Source/Android/app/src/main/res/drawable-mdpi/ic_screenshot.png create mode 100644 Source/Android/app/src/main/res/drawable-xhdpi/ic_quickload.png create mode 100644 Source/Android/app/src/main/res/drawable-xhdpi/ic_quicksave.png create mode 100644 Source/Android/app/src/main/res/drawable-xhdpi/ic_screenshot.png create mode 100644 Source/Android/app/src/main/res/drawable-xxhdpi/ic_quickload.png create mode 100644 Source/Android/app/src/main/res/drawable-xxhdpi/ic_quicksave.png create mode 100644 Source/Android/app/src/main/res/drawable-xxhdpi/ic_screenshot.png create mode 100644 Source/Android/app/src/main/res/drawable-xxxhdpi/ic_quickload.png create mode 100644 Source/Android/app/src/main/res/drawable-xxxhdpi/ic_quicksave.png create mode 100644 Source/Android/app/src/main/res/drawable-xxxhdpi/ic_screenshot.png delete mode 100644 Source/Android/app/src/main/res/menu/emuwindow_overlay.xml delete mode 100644 Source/Android/app/src/main/res/menu/gamelist_menu.xml 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 e1804abf96..19d4a8b3aa 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 @@ -1,8 +1,6 @@ package org.dolphinemu.dolphinemu.activities; import android.app.Activity; -import android.app.AlertDialog; -import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.os.Handler; @@ -167,7 +165,7 @@ public final class EmulationActivity extends Activity switch (item.getItemId()) { // Enable/Disable input overlay. - case R.id.enableInputOverlay: + case R.id.menu_emulation_input_overlay: { EmulationFragment emulationFragment = (EmulationFragment) getFragmentManager() .findFragmentByTag(EmulationFragment.FRAGMENT_TAG); @@ -178,70 +176,61 @@ public final class EmulationActivity extends Activity } // Screenshot capturing - case R.id.takeScreenshot: + case R.id.menu_emulation_screenshot: NativeLibrary.SaveScreenShot(); return true; + // Quicksave / Load + case R.id.menu_quicksave: + NativeLibrary.SaveState(9); + return true; + + case R.id.menu_quickload: + NativeLibrary.LoadState(9); + return true; + // Save state slots - case R.id.saveSlot1: + case R.id.menu_emulation_save_1: NativeLibrary.SaveState(0); return true; - case R.id.saveSlot2: + case R.id.menu_emulation_save_2: NativeLibrary.SaveState(1); return true; - case R.id.saveSlot3: + case R.id.menu_emulation_save_3: NativeLibrary.SaveState(2); return true; - case R.id.saveSlot4: + case R.id.menu_emulation_save_4: NativeLibrary.SaveState(3); return true; - case R.id.saveSlot5: + case R.id.menu_emulation_save_5: NativeLibrary.SaveState(4); return true; // Load state slots - case R.id.loadSlot1: + case R.id.menu_emulation_load_1: NativeLibrary.LoadState(0); return true; - case R.id.loadSlot2: + case R.id.menu_emulation_load_2: NativeLibrary.LoadState(1); return true; - case R.id.loadSlot3: + case R.id.menu_emulation_load_3: NativeLibrary.LoadState(2); return true; - case R.id.loadSlot4: + case R.id.menu_emulation_load_4: NativeLibrary.LoadState(3); return true; - case R.id.loadSlot5: + case R.id.menu_emulation_load_5: NativeLibrary.LoadState(4); return true; - case R.id.exitEmulation: - { - // Create a confirmation method for quitting the current emulation instance. - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(R.string.overlay_exit_emulation); - builder.setMessage(R.string.overlay_exit_emulation_confirm); - builder.setNegativeButton(R.string.no, null); - builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog, int which) - { - onDestroy(); - } - }); - builder.show(); - return true; - } - default: return super.onOptionsItemSelected(item); } diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_quickload.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_quickload.png new file mode 100644 index 0000000000000000000000000000000000000000..cd16fdd5080541f0e67ebf3bfc97a50ac2beda79 GIT binary patch literal 531 zcmV+u0_^>XP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00E0hL_t(Y$L*H8N&`U@hX07hLJ8QYpqOmZ*^79od;tp^ zb%|K|0D_Rp=xbQncq^;|UIV^E2ncpc1O*Y)CMNkT9HN`dY$94Hc&1o(=bUfn%$f5u z5%e?Gp?}b?040^tsY)uVqFbFQBQG$Y4ZL9=9tTuuv?@EqjmHLjj<93Wyx_7Y77&}z z8nk9YYUJ?o=%SMZKF4*~iFt;C(#EO4Skv4zSAo@qfIO4b89mmd`?zTjv~O0^<0!&r zdn-y(1!|V0J}T7~C<8#wfyp*i&bA9ge9pQ2f VFoeR4ydnSq002ovPDHLkV1j|y+zbE! literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_quicksave.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_quicksave.png new file mode 100644 index 0000000000000000000000000000000000000000..8c9e9cec086bc0b7d2e1a07185c395e13a5e1175 GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?sJbhuaI)d^k>+d46LQ%{X`<{PUA`t{6e7JM3FKIN!BNFf90-x2ib!)x_O)QuDLd zgzzm{d#-tb)(q~C>zyBlMmHus=FjE&Dj*>7X@T{r@4vZ%twOTiMl5&Qd+}znlnRf> zKM5(G7t?-i*6y`j5}xa{H$g7(!p)0C$|_4zgNqG>t<+>E9&5=s(ol1h^@`c1%m*jt jO004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00BWsL_t(Y$K}>LZo)tmh2hf}QYB>~9zjBECIv;7fRMMs zLm-5Af$$DgQJP!WbLRga+kIH^o=XoqK15F0*t+&;v`3v*g|s zy5o&gdF9pwx*;GdFO>73G9EFe+2B!1LLRp9l2B|7#YyNdDFns%jOj6BZ4X7bIQzOd zbXeIy?>wf8Tw!4fMZZi7kC2clO@yctnL#c>JoCNZ+0jObt_c+5AX*0uz?KHWNgaC* zO=~G=WkKx z$X}z-W_$b!{UqMfxgg+Y2*GnN7D4e#B!a-54~*{Z!wwfd3NoTilU2CuZ0B6Z_UsBP`#&E m+Is1!bIblNdm{hmW&YvE^KNo&|F$0JI|ffzKbLh*2~7YK7l&a0 literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_quicksave.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_quicksave.png new file mode 100644 index 0000000000000000000000000000000000000000..bb26bc075dc41e7b30c7413a109940b7b302d945 GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO=~G=WkKR z>FMGaVsZNF<+Gd(20U#K^)9?hYU&Hr+0pbkOnk$5akq@Iaeu6wci%ZBOFtg;)Jv}6mIvSeSd@>osa u2)V+urqV#XU#fqBZjH;5pTCx0y~%J?&PdMil4K>&5e%NLelF{r5}E+bO=~G=WkLc z&(p;*#NzbP%h6uUh7xQS?Cp3rb8&j??uZLhI4aBW&OxFuaH&YSq6pWzMQ@dC_K6&4 zoV!Hh$5YJ@a|Mbx3vYJZZ&r`LJoP|x;=Q}|?C)fz7HxXvxRdX=+?8kS8_X_eoXO2P zuy}%xugXI0#;pa9dEcZaTJxo?J6C$cQ|$2qL)jdqZ1033$r;|?=5G!^StOIwl2g7e zo?Cxu^4k`b(~~~L6c3aRC*el28Q-Sxey;J17Hm-`3VuX#lsR6lWG Q9ndEXp00i_>zopr0HvXL*#H0l literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_quickload.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_quickload.png new file mode 100644 index 0000000000000000000000000000000000000000..5f89fc257b71bee3b3e6ca55d89e57a3f3b2d4d4 GIT binary patch literal 637 zcmV-@0)qXCP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00H$$L_t(o!|j(%ZxT@yh7oM#OB;7Zi7_}Pu8cndb<-t~ zYFzM7gw|H5E=*jYR5pz+OkDLxXiCzi!L==Zpkg#GG&D?`Jl$MwX2NjqolzE=IkSPx zd*5g7aL&1h2$AVtkq{69{ujV$Zm~|A@7NsigKb*e=8T83;vaCC76ZIuz%wkDwhI0L z2_ABYDs0w>3-uEC16aJpBs%1Xuq?hA1Fq3`n7m_!JQ-$*G0%1Ce01FH)0CeL0hYsl zj{?y##YxJ1@z{?MAVEhi*dRG^muJ}w2B=GUO_O6$cKrh^Z29!MBwh}(gQk4a6+h+iscd#ng}h73 z$bOEVSnIcIL}S$4s-a-l_0ZeZtOt!jvX!p z9e(4~FUAnJhAibi%P z{*n$w1{(ziyIyvi533K%R25`o{zs_2v-=N#*|yls-=vKzMeEt<;LvBqHy zGn2MJo#2KIOr3lu);O$VmRiRD_W7y%B4uZ+-hO`-cyWW0nu?0z`<=D=1(SMq{j%IJ zk>RKS_X%5ex4+s~X8mfO9=zrDZ_{hcUAve*?KrXY(x;;hK(8`*y85}Sb4q9e0E^az A761SM literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_screenshot.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_screenshot.png new file mode 100644 index 0000000000000000000000000000000000000000..753805275baa08d95ede5eddb9f5bbf40a23395b GIT binary patch literal 534 zcmV+x0_pvUP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00E9kL_t(o!|j*NN&- zyFjRwSJ1{y7a@w05dK_G2zmh_Dy5V?Ejog-#QC9u|4dsxr9TI7ilCQO_HZI99(?xAl0u-Ny-YiJbE+wbM~jWhS_`+&KDaC)2NkH4`;z!88T YKN)pv1mZE@z5oCK07*qoM6N<$f-VW$-~a#s literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_quickload.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_quickload.png new file mode 100644 index 0000000000000000000000000000000000000000..72128fe69086bd90233bd2f16ca25cd52f423326 GIT binary patch literal 875 zcmV-x1C;!UP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00QGlL_t(&-tE~>NRwe4!0}CTo{HE;x%AM%xu62Y4l4=5 zL)5J>sA)kGC5fenLhzE>F|ZsdL3A_fP}i9R5)?rwRM%VObYIzLi4$aA zihqXFZWXpZqu8**g`zoKtYlnHjrybG@8@_{Ip!(53P$agM%M4?utis$x-&H*Dp zk8kE-)f!b=q{JT%hI7$0*Sxmp~@O40KeOUgyh7>7%-wczKq z66Ym5OSRWg$yI5pEZi39rJ}T(FFuBgtmZFq1JB0n26^b_)jEaWHD1u2f6Y^>?Wt{? z004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00Ci1L_t(&-tF1XO2a@92Jl?k6>MKX@X$Z6Af@;yE$tJO zqEC>QDlH<#s}T`21o|9G@zl?Qm!iAbP1>Ew;hVV)B>Z4EnSn`=G%FK=2qK7}hJp;1 zc*ZBr73pc9YrNy!k=6&92%KP&t++(2Nb7+zK#ycAegS$UTk$wf`GjkcG(e>!9Z(5L z3*;o}fgB`Fkd>qh0zm{36g>zch#-OpB1ju_zzP%e&_Wx1OtIDl<+%Cx^azC(=n{n1}JxMeo2Ki=wLal;~YzaR^EAWBMX{%K{HuU&kGvJf?8gXkp;Dz2I_l3Ls`(& z3!2M<)?Uzq^q+cE%DI(q9R)g0P8U0k=DKx|x_HtWKMIU3hqbHlh6oem1~Uv`U@*iy z@G4gXeTxmS`!LX}7$^$^-HU-1VW11-BAho{M|7o>RnD+*%?sSy f6GRX}1pUb$u{XmgXM?Q~00000NkvXXu0mjfr`^33 literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_screenshot.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_screenshot.png new file mode 100644 index 0000000000000000000000000000000000000000..c1a3549bfc0d4b26e9beaf97a65220052ffab653 GIT binary patch literal 781 zcmV+o1M>WdP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00M`hft2b> zSEV3Gx9zH6OyWYbk*SEEAe(#yA&V{){SZE&J`nl|suHxJLh2*!zpKVO(V4k1xp&g` zo>}HBewq6?=iaffdh4+a$bbyU!eSnonAZh*k6irXoet0&8py^quT_Iy@q>1v&P$b` z7u0AszVTcY=qbnCC%*Ee6Oc`gP0mpr7wj;L69r1Ki_X|56$Y|3a{%_RgF!jsh(a)E zGZxTxFz7rMP(2tFR~V2s&?T#6N#kN;ezXZ^vN*k1}OE#{G2(i)q!M6<>ZoA362?US)wk zUrt3O=*%~jpYi3+tV2e8)4Qe)1N)9)M6fM=4aG^+%^WxKWIrcpqovvECnhF zL;Qb$dTz*WCiS=!XjJv2o)Hd|)kw~fuVkE(*CLoP=D!3<;Ub>Z*N>0U>*sgMhaqat8UXvO%k~bc@B7OROX2TDrzhs$1A> zOOyJLF^ZHZQDjtDS#o8yD^32Cbd&#qRjC;|;dM00000 LNkvXXu0mjf*Bf09 literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_quickload.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_quickload.png new file mode 100644 index 0000000000000000000000000000000000000000..d271d8e03f41181bc2ee2c26762a11597ca486ce GIT binary patch literal 1148 zcmV-?1cUpDP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00Z<%L_t(|+U=TeNS#$2$M3zGqNy_{Ehs`}tygo=h7qGz zTgG09vD#iO3ihTKU8nAafz+mwnnmGQAvHEC{}jZ8jScoksFgd%gF0e$R0aoO9k?p8GxD&%Nh4=RCjX8zB!&24 z{Qv=8<4>g860an%9}qwWCy;LM-kVCz%I5(9WYd?_$`swisi2f1vdAExQua{8SIi{+ zUKg2~{Qv;6xR}tw93AXTx>xL`lUoVD|C8Y}VSpHC6AV5YG z?$SbTS~{EglvVoxuNsFKrOeY(u$L*j08bis+;7P9yc9pe6?*_NzBkB!Ow89_p2K-t z0B;z?KM^OgW~q};^lzUJrJQ<`)%69 z0rb~~hvWcqnN!4<*&%9wx3<V-!G`{#e4a4kQJ3NwDUaHO zv5!;1rxr6gm#_>t&q>OS39Ntc%Q=}O}VINOWOg0a&iEX?< z9X*D<&*HxKb_j4 zImqB^A;(zoWPX7LAG^3{^f-??hSM@XOx(YDIe@kP3?K00xI(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s zRFUlI;uunK>+S8+*}{P$$3Nza!c3{BD-ZhULqtjc1(;GfgFqpH`U zoHuZPP>Eox5X@n=;kd@=%lVDbmm`wFMQ9Uahe8VLgFm&5ECLP;j6zIHWT7qrJ4eAG zjN!A7(P8O*OxZ6MpAfK(WDK!9>iq9Y?XDh1y$$E=5}JhUWv+)6wL9K!I6Wt0Qeo@j zGDhK^3X!11^}Y^M?b1L0kzPGx>20Ni37Y562+G}HKC^jc;?u&TMb9Ggc@2);Y zXA9enlb0Lb#M*3Pd-15)q0F578iVW~u2cUs8=_v=&pz^a4(Ew|S4z%Lu~=~GScCm0 z{)5u5S+)rs_NhvH_jupYy%(7F)_gw^eO4#dZ2M)=HXE*)Y5jMlXBiz=+COvg8Nu7z zr(BkKFne?5yQ5NnTk>Do7tZ3^FC8{7@mSKAI&WgYXp&ANjnSXpOoa=mUr!3=% z&okb#otmF$-d)HrVY!dyRku}z&5z%Gs*O9W6|m?8o0U+!#q)||x#91BGxxN^Vq4*W b&?Ehw%@P7vCQFq9(;$PVtDnm{r-UW|xDGfS literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_screenshot.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_screenshot.png new file mode 100644 index 0000000000000000000000000000000000000000..7c5cfc5cfc6de93bc1ccde87e6e2a7b74a57eb1f GIT binary patch literal 1023 zcmV004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00VbPL_t(|+U=W5NK{c6$5qHtBLbgUDbZF$+}FO)1V;rI zA|)iI*iN)u`(F6QS-2GxTIt4BNZ91W0oWkj^`F)PfU&6Tl?8YQhabDf%jCUki4C06J?tGQgJB02`43PPGO& zi435-41fX9AK-#zx~QaxOj1cDlOp_dv%-b`0Nb>4J7j@)mkvJb3-FCbu0Q)yyP zM}R3ZU03m0OzQ=3#&hXbD|hM8xT zRpuGOPln^TX4L>w4wK4fgd^L?BZkOx7(JsB;Hz!tNv46HA;%w5Z~MJ$_SFG23f>gP zB6@~M5nL^*0Jep+mF!~r0E5CW`q)te&@MO|Ts!Lo=W7)J7edXGA13xieJ97_EgQk&5I2!M*A|K$o!ZA4vfm3WroZ-UC!xTvgHusodhP_8y?f;u@9)=(qTby$7(S zuz6{KIU${S4v-qJYLn;-SP_#D0s*FAY#;@z;0{&~0&L zNG7raA(8cZ53nNm=YMT{~+9XQ!He;FFLG z+=fxVt)baf)lxRuTFOBe(-&LHR&_n`9$7Yj9S31zzt%QBH_Uhsj#Z`|4oY$u;D^J; z*(WUB%jb>igRLgV1FJO3>1U257MZ1=GUtl|lHn5^RDW5#ibIzPG6OV^WEO#8Ipi#T~7FC{ll&j0{+ctt_T$rsWom30*W zT$XvO^iWMP+4%60O))j}vL;coDFukH41fWMH$cK)c-qt&U_COxgw_C~kpW6#vRlVT zLHlKWr+lgJ#mg~wH+R!m&~o~3ohq%Q5dBm@vp@hyZ!(G literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/menu/emuwindow_overlay.xml b/Source/Android/app/src/main/res/menu/emuwindow_overlay.xml deleted file mode 100644 index 7c103d831f..0000000000 --- a/Source/Android/app/src/main/res/menu/emuwindow_overlay.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Android/app/src/main/res/menu/gamelist_menu.xml b/Source/Android/app/src/main/res/menu/gamelist_menu.xml deleted file mode 100644 index dbec1a65f3..0000000000 --- a/Source/Android/app/src/main/res/menu/gamelist_menu.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/Source/Android/app/src/main/res/menu/menu_emulation.xml b/Source/Android/app/src/main/res/menu/menu_emulation.xml index 627d1bc9e3..a8456cd2c4 100644 --- a/Source/Android/app/src/main/res/menu/menu_emulation.xml +++ b/Source/Android/app/src/main/res/menu/menu_emulation.xml @@ -3,75 +3,87 @@ tools:context="org.dolphinemu.dolphinemu.activities.EmulationActivity"> - + + + + + + + + + - - - - diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index df9020e44f..3843cfb9b1 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -239,7 +239,10 @@ Video Settings Emulation Activity - Toggle Input Overlay + + Toggle Touch Controls + Quick Save + Quick Load org.dolphinemu.dolphinemu