From 4e999fe0ee1100ef4bee2e3fefe908222a5c2e92 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 27 Oct 2013 22:15:49 -0400 Subject: [PATCH] [Android] General cleanup. We no longer need the buttons in Assets, considering they are now resources (ie. drawables). Also remove (now) junk code from VideoSettingsFragment.java. We handle the input overlay within the InputSettingsFragment. Also add a TODO detailing what needs to be refactored when axis support is finally added. --- Source/Android/assets/ButtonA.png | Bin 5178 -> 0 bytes Source/Android/assets/ButtonB.png | Bin 4971 -> 0 bytes Source/Android/assets/ButtonStart.png | Bin 1511 -> 0 bytes .../emulation/overlay/InputOverlay.java | 2 ++ .../settings/video/VideoSettingsFragment.java | 4 ---- 5 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 Source/Android/assets/ButtonA.png delete mode 100644 Source/Android/assets/ButtonB.png delete mode 100644 Source/Android/assets/ButtonStart.png diff --git a/Source/Android/assets/ButtonA.png b/Source/Android/assets/ButtonA.png deleted file mode 100644 index 7e685324ae8a4ad016eb1033d64b659966cfcd0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5178 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 diff --git a/Source/Android/assets/ButtonB.png b/Source/Android/assets/ButtonB.png deleted file mode 100644 index 21da4c20f123fe6409b57cc6d837fd0f60786098..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4971 zcmV-x6O`Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv000u&Nkl#ha<5{UH9txuIOkZs809n`&%Ts0+5dL7Mp+hx=8#iZN56lus~=G z^GCTaaPJYVwOL@?*!;U~#ueG%;YhSLCE<7mhNB0Na5}l)^@HUA@@`!uHsv#ADq?zo zpYg=zwNdDhX!8d-c_aTCE$TUE&YT=*_Uzdn@p|suxjFOZ>sC!i70?@py>=vnsf* zABcEaGs-XfrT!6#bQYs~VAgKTFnuJ!bnJ?0)28K2ojNsV%9JU&(B#RJ)5w0N`*OK| z`t<2JGiT1ssjRH@!1;S5@3b(JN@!YiKc8p6`(ykD&dIg$6ywpV4`Zf9vFvPwk$;b-RBzM@e$?6 z$Wr6Kj#sx*H;kk5H85_N&9zL99XmEUX3Ut_op;_D8$EiorMO5+{3x7k%M;3nl;MCf)`3~PTphN*gfO?uFFfb?2Oo%oz0URm<_{0chZ(StP zy7A)7;!Z-5eOQ9|=>GQ#3c47zMPf055Qn6~`Fg)VYF()Ji^Krb0@CNj4)MQ7+@pI7 z#dtm>AoE0Vv_hZ9&?>Fx0ipFh-vYDFzD(4K);2o`R`S-nqw;^~(4k11VN)^LYMvyM zuZ)J|mf>gJyuI(hX_Ilj`(*GUpYu(#k%(N4=m6L3(|4-05#k#i8`h}8u zfdSTnU`@l*24pB09UW`tTteFdVUU+03lu$0AWuS z3Lbu|@%COl)MI>*T7o)|Z6GZLgu{+M6KfjBpyQr7wWYKAh7A-nm)K{_o3~0fE z1(rUi|N97(Q$;5Uuu@$CtVBR|1WY{#ZE7J<3Z*Iem>W*gm_!b~0S+8tc|L)t(PR+n zBKf6(P`B^H7A*?plyG=aZ6uEkX@fA|T8wuPQzc^dL{aa>ix;0JIzx2!k|j&d6I~#> z=>|;HqW+?D1jOe>eF02B^kyxzh_$5|ZO|}*Q6y8zM-xmqWj{Fr z!+;P~0)=CYAN?>A`-t;MlR&UZj!~<333GBto~P&G*gR4}@`ib&UMdhyg>f->ju^gB z%wD!^*|IN+1}tB`{94f<(U(Qnnb!k#&o%n|N`2>2z9TwE+Hxj9XuVznqbr)FXSD?c zfX5sp3_@qFt~qj&9st-r2~sLSiyp|@A0$%IR6hQ`vN}B|N8UMCL~M^s64*U9-ww%( zdLngg{46o>1;aQ@Uw`kt_ug{PJ@*XOb;!zeo7h^qzSB?97He1`#{o6&^U))Y*l%WeWx;F}hfb8oVs5k;o^b#D_fKE5X3cET{IzS>E)*@& z>qWfQbzW6fRi*Bkrh5To3_wUDZqZtp$7T2sqY1tBtS&fP0nm~VNmj|eBp?q2mr4I& zDq7Vj0D@n#($_Z@WH#+ zuV24PR3%!sVZ(+8MC}JzzH;5Vb<1?`0s%5ZU`!AYBL(8^_zgh7r(j}e8_y-j zAkhKR$)1%j|TsiBx z8*chZHUPNyzS*_=zaCw%P)f9VlFVU*wCX0Uf0dqdzCh?hcqCaOV-(~04geu$5G!{g z!v2hAkO&{Kx)cD3_-XAQ^%wITZ1VM9vCwZ%7AJ}Hm3m$z=?_BslH7PCh+4nhwfnz= zAZ*>b^}E})ZTp_C-{1b&V?TId(c)Kse`4v!!TVnB+wTLJ&@6#aE)c$IOaU!8QyS1y z8qiT*zm)(eU|;MHL9t(#NmI8-Mud#@1Hbx557UQO-;>Dw{PG6Gw8`DpZuxlN4u&w?tiak z8!vlv>9N^!)?*3+pp5l-juNG_$rz;pC7d0knH~UWr(P4LeE^sY(JS24n;rTO6e*9% zf-DRG!-o%#iwb0G#Nkc?fNTx>$NAkV0LI9P&64!**|>4zrngIbrvdQPQ&0Uu^opTh z?AWp6B|v%YimUz+1Ylc5#a012Lk{sy!XpV45rMQ>;kS!Spp7J6WRBV%0AYS0a83w6 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