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 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4i*Lm25-&)VFm^Ug=CK)Uj~LMH3o);76yi2 z3=9knFBlj~4Hy_+B``2p&0t^7+dX!e;Lr6`SxWf5i1=j1;>GxM{t;1}a- z3+peeXHcDbaiy2m>P69WHI?-Z=JW1Jl$T=<$=sr4eWdp|TTS1Fcf9mQXJuQ{rDH1(L|ndO65e>VwZUfc6-nD`OMdUj2c(~9-L_M~gN?gu%w7#}QL-|yjY|qvt%+$cncG&Td`SNWiT2xnhFP^fww|LwBb=RUFbf^ZE z2&*0qioKDw#>D;R_r!_n%dglOrFR$RzT~hL`?!9?*#PUkVq11RGhH0`)q7X4W98dd kx1P%U+~51h@q+Z@bp|bmdiE$WFfcH9y85}Sb4q9e0D;%s3;+NC 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!ia0y~yU{C>J4i*Lm25-&)VFm^Ug=CK)Uj~LMH3o);76yi2 z3=9knFBlj~4Hy_+B``2p&0t^sy7v0M<^89( zq&HLUS>nq>=W7UaGWsn{KhDnaqvL+=O^u4F@jQe*td3YzH5_USnxS-RdMjE ziM#Ej=4Y=7;ajryT=N308QdS&J3kDKZcKX2pUd@CKtSTt0_#)Xe{%&}g=D>rSnjm< z;>~0!6&{a&5>h-brv2Ki-D|ldJlAP&f?VQ-n-`0eRhFa%7aIs$smV?}){=3gq2?&- q6|+s54^GURyfE-g-a6CBpDcx;hRo8@?XCJ4i*Lm25-&)VFm^Ug=CK)Uj~LMH3o);76yi2 z3=9knFBlj~4Hy_+B``2p&0t^GLgYPkqdfhM$>Ro!+9ixy1DXvv=R-C-+2lJ?;&z ze0q&#m!g8U{*=!PjN}ZL-Fy(}CUUv%_u=lJFhSF|Wrfg8M?EK-&wKCRyy(`kj#K2ZLKHjCfoW`qJY}o- zo}|ZI5_CG#?VQ}g5ggDU@b^)GzPOY~dm4wKucLFzhi>O=8JEeiN#DDz4n4fQ;$_ce`tAaa>GraX2u+%IS*Vmpe1XA_IK4di3(|UiMaP*0r-U7+Q~=m}ObZ z_G6{8SxXQ5?Po!YuhsqVpA>NNm1WmV8GHBtugr_SUf>VY?CCu%D!!3{fq}u()z4*} HQ$iB}0L-oi literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_quickload.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_quickload.png new file mode 100644 index 0000000000000000000000000000000000000000..235c84f1e5ae02090f7d9e606ab025ac421791d3 GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4i*Lm2CurW#S9D#3dtTpz6=aiY77hwEes65 z7#J8DUNA6}8Za=tN?>5Hn!&&zUNC1@pbY~915=W>y9>kr_Wm>b85kHi3p^r=85p>Q zL70(Y)*O)8mpok@Lo80;y=?1u*g>Ez(Ol)5r-ne`KRu2sjV^&l#4I^Q9|;MrTg2h# zASlggZz4G9vFRl58!yA&ubz3eX12$#&`;tmoeKhfhHxBPetY(g2{*ImMNQbHs+JO0 zu*JaC#9(t!qJPYdM-NtAEPnI&%4$`g0-M9a<@SfSwluh^%L#J%SbyvYNW78Gzqd8~ z%rB1qiVmmjJKI}h)|T8oR6JFG`o^QIdn8RiOf1)V{LtHW@fMTmo@duisVKTQ^;$^4 w{MP*357m2$rLC8qI=AfavM2I?UgjTuJntsg_HXMM7#J8lUHx3vIVCg!023F7VE_OC 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!ia0y~yV2}V|4i*Lm2CurW#S9D#3dtTpz6=aiY77hwEes65 z7#J8DUNA6}8Za=tN?>5Hn!&&zUNC1@pbY~915=W>y9>kr_Wm>b85kHi3p^r=85p>Q zL70(Y)*O)8m7Xq+Ar_~vUOvm&V8GM%Q18O4q^7<=ogGb&!^Ahti}PpuquHy_^i$9B zNuxl=L7VQMJS9F)vi30l{3v`=`axMM_eCbfssr2$Lh6~g<+>NEzigN;%__TrNlUhX zDNFVRE05I#j*u%nYbp)I`=$C9=+?L_`T1-4)td}Q<&5MEFG*H1FfcH9y85}Sb4q9e E0L|r6ivR!s literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_screenshot.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_screenshot.png new file mode 100644 index 0000000000000000000000000000000000000000..4dbf6c77bce2898fe96ca0c423836a5c297478a1 GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4i*Lm2CurW#S9D#3dtTpz6=aiY77hwEes65 z7#J8DUNA6}8Za=tN?>5Hn!&&zUNC1@pbY~915=W>y9>kr_Wm>b85kHi3p^r=85p>Q zL70(Y)*O)8`#fD7Lo7}oy&UbuY$(BY!QPH{GZ&}F?vA)Hg`=_@?;Iow1DA@FD~fQf zTl7}RW}nD$#<@#0emvFuFjt_6v+!oe{bu#}%To_DC*HeT&;CwkYSE@wjyw5|%UyZK zzQOEr#+lr#1B)m4_^K?_Zrob%nDeoW{)m`7K3VyrCf4P5< a{hC+QLG=>{)-f5Hn!&&zUNC1@pbY~915=W>y9>kr_Wm>b85kHi3p^r=85p>Q zL70(Y)*J~22F93%@+z3X%ozO>MdRF+G%K^wywvXsr0hygshkk{w>$S zR_OV}EC?~{)$@t@>Ym|sY1zT8x^)YZO!Q1ld}iC+jmb+pRPcUopx7+S&5dWO@29^j zIJdK%W8%xWi2?#l|HKbu=56$w{r-l`$L8FqJI{LBH$9Rsm?_4*C+UE(&h%|u{}?#s ziaNA%u61yK75c#(vFE6Y)sv15I{PG<*Ig{1u_w9JMl!9_@ODsKpxC0__=cBZeXGIx4eK>tMREVoYMGh2 z^>yI$Ie*g`7ym2Di(;58|FfTAu}SP)u>}eYzh^lWZ-3{XbhSxt!lbo}Qg}4FMeUz{ zT$xkm-@3>9)QP&jc@ZB^tIg*Y9{d zr^+$PaKhdxyUdL1)OOE#bP0l+XkKP&yG5 literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_quicksave.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_quicksave.png new file mode 100644 index 0000000000000000000000000000000000000000..aa0332092a831d643dc16620ff8741c3ec9ccc7c GIT binary patch literal 359 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZsB3dtTpz6=aiY77hwEes65 z7#J8DUNA6}8Za=tN?>5Hn!&&zUNC1@pbY~915=W>y9>kr_Wm>b85kHi3p^r=85p>Q zL70(Y)*J~228R2dE{-7)hu>azTvlfAU!d|z?(SbmBNGGFlI?-D%+)~rRfdyak; zwi1Xs;IyKV-HE@XLy^Hofx)hq-R8sU12a_x85y~aq)a!YUaBfO<;OY4`Ymspq`2&c zEq;rp@^!3nSi{VuEl?-8VFObq--$I2>zJjM@xOh3>b^+X8LPM7Uj<&=prodvqWFGi zt$x9zo?X8zH%w$WD!_fhmfh{I_LW(`nx_YEx&7Pp8gth!rcXOgEWPyUXafTS1B0il KpUXO@geCxs)`b=T 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 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZsB3dtTpz6=aiY77hwEes65 z7#J8DUNA6}8Za=tN?>5Hn!&&zUNC1@pbY~915=W>y9>kr_Wm>b85kHi3p^r=85p>Q zL70(Y)*J~22F5;57srr@!*8db^O+bx25{7hGV!uqkZdw3A-IuObx$q z%vW5oYm&gf7=Ml`Mn$cqQ*3pudJdgQIb+$xegEd%@^h6B{ywXD-lOol_6dgpRDx%-j+mlTL`vo+6V4X}uYMd-E;-9^?M`LhVy*1j18F}MB(*|3gzq?I zFj<}A4MDA4#_A@fB zGsG_HJF0uWphkA4cGQzjK{cN_Ou7A+YQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)`f+xyS#XJBC9EbxddW?V=x;Tbp+ojMd&2Mj-mtKG8-t$_u z?s@6k-~Ro3@BHs~mGiz=*7q~JSJuj~r8q#4H2bHEZZkX=9r2i`c1|X^#nRXJ;0?yT z3i`HZHpIeCH72V zQ(;qOzx@g2Yg~6sr59XVvs-xKx`Yts^WMx{DPQKY$h!VJ>$h&hD(NSuBqHZ$ZZQem zvSEezmH7uhM$hwj|B~gZ*X4vmkM5q7c_HPHsOj47)+cmA+jg_kG)w1Q?vec_@2_M& z)o47zdTfX5xrBqqJ5wk4bMa?A(`dNW@*vWCPU9lE9n%~iaY$c17s%ktb#P%(#1nVc z0B6gFB&HLwd<&*96iHs#|6%&n*yVb=6YZ56j%}IqX5ECqhj;B%TJ~Q*Q25F7M8y%S z6;ZQZe80^mE3`@V=9*1^W{3sd+0I*~lQKJCHGk|hv5c?VEUK55?>5d-=-+arK56xT zAI_O#D}vT8xI5|BMa$F+s+#9bzfQWxSI5ygEi>qmjDluL=f;x*SLmPC;%5o(Q?BPF+Pyb!eeis%&~sI5@2%GZPljf$(zzq{a_OQiv-R!Ty4O6@ zFJwM{>;w=(pi+&I8E_j39L3 dKld-z9{FDTA7@t8GcYhPc)I$ztaD0e0sxisjHLho literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_quicksave.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_quicksave.png new file mode 100644 index 0000000000000000000000000000000000000000..6c87e1358816aaec842a21e215d2a70a3f0f2035 GIT binary patch literal 489 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84i*LmhW}5h&oD4BC?tCX`7$t6sWC7#v@kII zVqjosc)`F>YQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)`f+xyS#XJBC9EbxddW?@zv$BurYn!)1-f>qaAo{uJ#x#wwNQj~0GETe2sbI4o6>4dC?T zexmZSQAWjg!qg?)OpYvqBDNe#9SThxN*>ZB2e^d4TyT=E_1Soh_34hE-@kCQioFn= zer@C8=Cy1ZEF?nbf11>8@R=9ovjm#nq0XR!#sI_*Gt#X-AE qq31RfoaMfATi8Xwk>&46`Hkj>HPV~c3NkP-FnGH9xvXYQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)`f+xyS#XJBC9EbxddW?Z%&uWk?A8#pS%=dka5q+U~{Eqs*PfLU+`1bjp3zQXqW6&+k>b0@^+zoY6woRtR4Bs|1J6b;K za5Bg+7Q0Yp@WMtcz*a&eTw;RR1=ZClo{y7~A5ThaGhO$Haqh#9FV4NSKbSPzbUpV1 z(K{DrnK-!0uQXr_TTQ^xPU}x0=hlm+?LMX>s+y9^tmuGpeBryc6%gTs>SL2r@o;o??j&3*Bv4mAzzow6Xct6)#Kd64R5%!9I~CBIjLm$ zowyeeY9(~`j2)kIae1rigQB&ocIa{KRG!lkbAX3)=IK|fYI_+Kt7kMfY*#K~`?+qD zIDfeeS5EMCgQ?q3+}-uS n=>A(?P@-tyd9j}TFWYNZga40tw;g6+U|{fc^>bP0l+XkK*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 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4i*Lm29JsRH#0CWC?tCX`7$t6sWC7#v@kII zVqjosc)`F>YQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)`f+xyS#XJBC9EbxddW?PsMdS`(G5@?D^|u z>udh!bE@}#udF*?$Ump}UhKTzw)fBPeQx>OX8&_(MWJ_cg$#TL7%dpsA27%?Fc*M0 zckCJZizkHrl1S>ZUbEql>@tZ({bGC{GG=8Rf6M4nIghU{ZLis}cAM#&YTq!}xY+KW z;3vJfucvn7&G*i^&(Z?$U!gTG;i%j@MT z3;!}O#y$35a!Y8v$_9A>2R8KydGGJd_Bwm&IU_^L<>^;WiQGN1a={d(O(zuQ2Ym}T z9DYXSZ=CqdS$`QAHtm>k;gF2%8=qa_Zm zW%)FN1MbHh-(7Obi?W*ib4uuMhV@eI5=+lq4%#qXb2o#(RQa9!6QB2p*dG$DW-#1m zexlyz%=Nf=hbyBQ@+FSg3tDh&yTPcDa?hYLY2RD(+q0a`wndwtZ>m*nV4Ak2b@Q37 zTE&Ja-)%>?|5ckUeRIXO*UzFh=`(#;qZXBWb|1%q-?t{}9-sdA*p|MVObp6hDebPm znHZu?PRs9Be;?wXEG?y^di@ z8?VFKJ)*6=4!ZHFt-KG?ZZN7Hwrh1eTqj(=oMDfIS;OT+?wPL{@--Q36PZ_pFw}8N zJ1A;%9a^_xulhenMhn3ibI(ti$d^+e*c$e`#e|gm7B_VW1VbaKMT`^1--#q z%mNQ*DcPKCe)R3@qo)m5Yy}oZ{m#90gz?Muw)Q6sMKgnsOuwm^Rlj}PHQyy=IbZDT zkF#{`{-3J*Wy#Umn+j($E!(Pij%&*G>-VhUFKww;jkeM+Iq~7ZT}`3OKMyU45p{X6 z@_xsI_wgs5^f-R4G3Zk#yOl?Mc*cEEGnM6-1g@EqrAr^7m5K8H0X}B@8#;6MILO+z?S1n9Esx~3qQ!x? zjxzhdzrnX}-x>L&XW}>a3!c2YwnjVYzfpf~$QO%Kuh0B4vY&fvq2-AO*^0*_KBUw& zvdQn>k@3Z%->U7hk-g8I{gsvtTmSLMe|Wshag$(_=Jx0?&-LP)=Wl=cNbB*L!s)4E wGZQAn&06{7Vebm=yVvicW-w50+xee&zopr03E{(N&o-= literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_quicksave.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_quicksave.png new file mode 100644 index 0000000000000000000000000000000000000000..51998492cb52124ca6e6990966998dff0f116c0e GIT binary patch literal 747 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4i*Lm29JsRH#0CWC?tCX`7$t6sWC7#v@kII zVqjosc)`F>YQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)`f+xyS#XJBC9EbxddW?1WiiLpZ=h4sOoT1FND2L?tV zrX{jamw=t4;1I^}*~jRx^ggES7mH5_*hVsjSRQr$ccpe$52N0Ob9M<$LiRG(!;0D+ zZ#SHtlQF5Vb#WP^a8HFuP~v)DhpBeypZ`d&p0V_{Qo;ny^JfI*ZZMzOyfX1=;nAXJ z5&66Z$8I*f>7KKN?Z(N=4R2y?HnF{URP0b@&V7wR_7B&of0_+ZFYIR@c|3>n#J(#f z=ciaKICZSSeiQ#e>DMgVgbw>urM-K+@95qOOnYm-pNKxI6Kl5pvS^zP*UYs3yVA3a zjw|h-x%iCW?d?-8%RHF9x$@mnslP4xuj~tFaqX85o0oVj=}Vngf2f_&(c-wztP!Wf z$_zHNs0(dmcqvztyGBi(tKztrbHny8ZA^JZ7X%(iwL3Gi#%=pk<8o(3;Db;Ng|o~* zz821PKDSer@x0^S?>^PW9o7n1bb`%FDBj|E#j)J* m_rIBY+F`M+a6ssh{?29zfh&`xN*Nd!7(8A5T-G@yGywp(4mceE 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 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4i*Lm29JsRH#0CWC?tCX`7$t6sWC7#v@kII zVqjosc)`F>YQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)`f+xyS#XJBC9EbxddW?ESDQHHhW{i+0|vGO3=#~o47VnP&h}$CKOua=@?8ueAKEiY&I!vh$bFif zQF?~?Dub#_k*I9I8leYv@jF(P?Oe|FKuo@~b=!$h#)8TGN4(ze6s&FtV#+D(%9^|B zB#UYh!%Lq<)0u|?{}^s>DYi~&teDPc_nP}duiH9T zord7dB!Bk?O{3WGkC8sFSqqL8zYKfA`g|9|pGSoucS9tPTQSV}sPSss7Mrem#b*rX z4i?YVYMYrpHT0R}A^*0=JJPN)1oKTkmENL!`-F1aiDC)c#X=8O=RWsb);M4BxO`Cl z@4Y$St}>c%-4i*cRMqAo7^Az2VO#5#sc({gF*G02|8*mf`GTH>bd2?Dmgm``4B}2_ zC(EmSbFEcB{zzBhh3$b&52Pn{Jz+e!_m!=~^bPOjJsD-V+CyybF^5FOgkIuYdFRpk zZ*mJxJd&Em_G0^w?!D|AmTjoaY_L?ETgf*;>Z#J7<*JI}Dl!KaWi_mByRhb!z$U#% z3y(w}sp~$i&l`~T@p=XSh1|ka54BCqiW9$9@o!N2@uX>mf5G~d8qeNE)Km(+fAjt1 zwhHc0k>U%A7O!Kivsu%Z&#HScc>?#Hw!r;s7v2oL8f11e>Xf7SW%1}!VWqYoi`x?w)?$`>J`Z+HvO9CZ}Ge_o<4_Tsq(A zc{kIfhr;3w#fr<1{oWKM!&lzF*k#3q#|7U%#b->LSC>5{ob~ayrsQLVomTccFL_^| z9Paab%Y$x%~yJ5uKG`kCCYxGu^2cVX90fpZKJ49p1(JPpuH(C}aU bfxdD1n(aNxKMNQb7#KWV{an^LB{Ts5o2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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