From d843dacfd404f56797282e28863a3ee18827d85e Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sun, 17 Jun 2012 03:36:59 +0200 Subject: [PATCH] (Android) Added placeholder ActionBar --- .../classes/com/retroarch/MainActivity.class | Bin 907 -> 1937 bytes .../classes/com/retroarch/R$drawable.class | Bin 392 -> 628 bytes .../bin/classes/com/retroarch/R$layout.class | Bin 379 -> 379 bytes .../bin/classes/com/retroarch/R$string.class | Bin 412 -> 412 bytes android/bin/classes/com/retroarch/R.class | Bin 459 -> 537 bytes android/gen/com/retroarch/R.java | 19 +++++++++++++++++- android/res/drawable-hdpi/ic_action_close.png | Bin 0 -> 729 bytes .../res/drawable-hdpi/ic_action_history.png | Bin 0 -> 312 bytes android/res/drawable-hdpi/ic_action_load.png | Bin 0 -> 725 bytes android/res/drawable-hdpi/ic_action_open.png | Bin 0 -> 578 bytes android/res/drawable-hdpi/ic_action_save.png | Bin 0 -> 614 bytes .../res/drawable-hdpi/ic_action_settings.png | Bin 0 -> 608 bytes android/res/drawable-ldpi/ic_action_close.png | Bin 0 -> 349 bytes .../res/drawable-ldpi/ic_action_history.png | Bin 0 -> 188 bytes android/res/drawable-ldpi/ic_action_load.png | Bin 0 -> 406 bytes android/res/drawable-ldpi/ic_action_open.png | Bin 0 -> 281 bytes android/res/drawable-ldpi/ic_action_save.png | Bin 0 -> 306 bytes .../res/drawable-ldpi/ic_action_settings.png | Bin 0 -> 304 bytes android/res/drawable-mdpi/ic_action_close.png | Bin 0 -> 472 bytes .../res/drawable-mdpi/ic_action_history.png | Bin 0 -> 234 bytes android/res/drawable-mdpi/ic_action_load.png | Bin 0 -> 506 bytes android/res/drawable-mdpi/ic_action_open.png | Bin 0 -> 407 bytes android/res/drawable-mdpi/ic_action_save.png | Bin 0 -> 418 bytes .../res/drawable-mdpi/ic_action_settings.png | Bin 0 -> 395 bytes android/res/menu/main_menu.xml | 12 +++++++++++ android/src/com/retroarch/MainActivity.java | 18 +++++++++++++++++ 26 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 android/res/drawable-hdpi/ic_action_close.png create mode 100644 android/res/drawable-hdpi/ic_action_history.png create mode 100644 android/res/drawable-hdpi/ic_action_load.png create mode 100644 android/res/drawable-hdpi/ic_action_open.png create mode 100644 android/res/drawable-hdpi/ic_action_save.png create mode 100644 android/res/drawable-hdpi/ic_action_settings.png create mode 100644 android/res/drawable-ldpi/ic_action_close.png create mode 100644 android/res/drawable-ldpi/ic_action_history.png create mode 100644 android/res/drawable-ldpi/ic_action_load.png create mode 100644 android/res/drawable-ldpi/ic_action_open.png create mode 100644 android/res/drawable-ldpi/ic_action_save.png create mode 100644 android/res/drawable-ldpi/ic_action_settings.png create mode 100644 android/res/drawable-mdpi/ic_action_close.png create mode 100644 android/res/drawable-mdpi/ic_action_history.png create mode 100644 android/res/drawable-mdpi/ic_action_load.png create mode 100644 android/res/drawable-mdpi/ic_action_open.png create mode 100644 android/res/drawable-mdpi/ic_action_save.png create mode 100644 android/res/drawable-mdpi/ic_action_settings.png create mode 100644 android/res/menu/main_menu.xml diff --git a/android/bin/classes/com/retroarch/MainActivity.class b/android/bin/classes/com/retroarch/MainActivity.class index 377b626eae8132a695bb6877f9e398d2c31935dc..33f0134ca22eb8783c6bbb47ac0f7ddeaaac0069 100644 GIT binary patch literal 1937 zcmaKtTX)+;6ovOBPMkO*rOu7qN+0*A|5{Q><^EcQrp>|Dx=HImMJXPYZV?tp1I4-C+c3fX+ z`Alapjwz$@HD>LyqPI%h#W;$@VbDbj0~pM3HD_TS7X(H_siPRBjSiogSZxv~UTR1=3y&7MRMFPIKuJJKv1db}KuA znZ_jmDw{pMzayK06TV7{FKOAV$cA*atg!>#79DX-1dT}JJ?eVm95{BvQFXhb15ef0 zT3(|jgCTq%FdP-n=!Fcf<0I4ckC`f0KDmj7jNk@V)A)q%PrE{dg`4=41<~=Ur_J{~ zL#w->;+_*!JSV_0`3WV14Sbcx{hk5w)T^;(yXrfkw(tNIQku?> zvdY6GaJSo^lSk-f=9Ic$XfK(KRz-wIrL+cRB0-#a>2Ouz94 zPhdZ1tw5g{4_pm$&8f%VVcyxi3SI~DhsgZKMIWpr2wc6wwG{_o6z6y+%-rIy*}RPu zVwSPM7)4BQ|0Jd{711YSLP94CuVaCHLFpHh zJXMxpiWtqe@#gxa>^sYCdOJ(@9M#T8+=Y0@5qA_TQLzJ5{x1J|`pCYD zYe|MjNhOOc;`&zh{X=}X{1@1?Hg07nc{7pri`2Q;Q_JE}&P9BK zZG2T_Ni#S=Y{B K3AmAmwf_LtBfiuC delta 226 zcmbQp-_6c->ff$?3=9m047wY+HZe-E=jR0^mKLXSF)%YI^DrnfaBwlGGAOe%s7)4N z)#KLWVNiz%X-@WJHDP3#T*s=#$T4{(YalN_11p0d5DGC!G6+v*XOm@SVNjfG&n{}N zq_u@XavOunMxaGZ3_L)R4`@6Cg9HN$P%Sru6az1i$HTw~Cixinfiw$)I!Ldr21KtG Yx?Xvp3I(8EMJ#$58MJ{WFfr%=0IePx*8l(j diff --git a/android/bin/classes/com/retroarch/R$drawable.class b/android/bin/classes/com/retroarch/R$drawable.class index 6b99c19c15f38bd0ea03f83c4f87c89b56416542..9cf4ba1bc2596a99ae576dabc483467b7e445ccb 100644 GIT binary patch literal 628 zcmZ{h%W4}j6o&uf+c>@^X`0&Zz0D%&qC?j$-53G^(}G*PHL@&hnTb>+*`cdGQ&xp6 z@&I|L(4!&2lR!6T=KGKIpNnp8udV@n!cl?}p(pKm>Qr!6IJr#6M{_4G#4J+@DumsY z*oZU}W|4lMt&|Leu9j0FgSKWWGwT(B&Is+HH9iOvCL&v_@}Ckw*xMdmY9Flo9TP<8 zY!jIk^Qdww1=apiCaUEJsu!Ewnj72SI(QX=HVYrmR|!qdWMXaPQn@JA2(>TT=(o2+xmQ_+|M{V+mEai*+e)U`A)0^o`NtK{cmNT35_3i z?W8)@(WN&2823kLof)ItFcaP@pWq#reB?o>-!Gn@hCAgaO3+6YHKv5AggWz1fg8-t z0=Jmk1@16+3%tv`SKxi-Cj~y>N)$K3@flZ4a|Ws({-Sr8w=m!s8v+-4&asvMSMdTb T^ZctkzQ!B=HuCFl@gDtulOBEc delta 161 zcmeyu(!tDi>ff$?3=9m03=$K$%y_snljCy|OY@R5Qi~=ANKgDM!N$wOz{$WhS&*@a zQEYMxqgoatgCqkh0~-S)13OS769Wg3#RyUZB)Nei`d~f-1FP0{2A+*zC44{S!C;$Ke delta 13 Ucmey(^qXmeA0wl{WPe5-03;;@8UO$Q diff --git a/android/bin/classes/com/retroarch/R$string.class b/android/bin/classes/com/retroarch/R$string.class index 2b74c5aebc496723e4b281c87e17ccb61cefc0fe..9838af76c9e6f00ed3cacc1b992a0d11fe980dde 100644 GIT binary patch delta 13 UcmbQkJcoHhJ|m;ba-V`LCPSCX5WSIWr10;1R%6esI3RxukfuuWdgs35=~%fQGW&mhU50Hl=|Bmqtd B8?pcZ delta 37 tcmbQqa+;az)W2Q(7#J7~8DuwdF)~ipU{qq1o}9y2#jM1@GWjK=0sz&*3Hty5 diff --git a/android/gen/com/retroarch/R.java b/android/gen/com/retroarch/R.java index 2b02953f09..4b7bc1bc03 100644 --- a/android/gen/com/retroarch/R.java +++ b/android/gen/com/retroarch/R.java @@ -11,11 +11,28 @@ public final class R { public static final class attr { } public static final class drawable { - public static final int ic_launcher=0x7f020000; + public static final int ic_action_close=0x7f020000; + public static final int ic_action_history=0x7f020001; + public static final int ic_action_load=0x7f020002; + public static final int ic_action_open=0x7f020003; + public static final int ic_action_save=0x7f020004; + public static final int ic_action_settings=0x7f020005; + public static final int ic_launcher=0x7f020006; + } + public static final class id { + public static final int close=0x7f060003; + public static final int history=0x7f060004; + public static final int load=0x7f060001; + public static final int open=0x7f060000; + public static final int save=0x7f060002; + public static final int settings=0x7f060005; } public static final class layout { public static final int main=0x7f030000; } + public static final class menu { + public static final int main_menu=0x7f050000; + } public static final class string { public static final int app_name=0x7f040001; public static final int hello=0x7f040000; diff --git a/android/res/drawable-hdpi/ic_action_close.png b/android/res/drawable-hdpi/ic_action_close.png new file mode 100644 index 0000000000000000000000000000000000000000..1c74f6df01d05ee37092477c3dba8f4bdd254c40 GIT binary patch literal 729 zcmV;~0w(>5P)9r+DI2-4N@xzO8>z@kIKrc??wRBD33^rm;r(jk#pL(_$!J65Ce1tuC*8!N8rm!FL z>cT9*#SVhB>oU6Qzzlvsn3n#ILdnPUdkxcRJi^W9^-w;RR1FG^54#hMMz9S_OFWjy z|MEkLUI(gRR!9r*J8ViE|7zTg_)X!f_Js|3&{8#y?-HRF;AF(_n&Li%bv0m$P^q2j z!mkm(Z;K0lnE?>_PQ0;3r$Xa9+bZnFtH_VWpi(>46Y*J+VRNA9ru-fDA_7$>Q=vWX zhYW`T1^rEvb%{{XPT~82$Ilu5sJQtapBIdJg-1(5rmz^373;5NxKnX+ti)_>B2=(b z@-tMKMl(FFxOuz6Y}T2Q?>l9BUK^-sIIB$IdI%_aWF?)NQKsZa-7<|Phq?l)cBbSn z->MVAl?(?1X8j?cLZ^~5g&zZT$1-dR6#NqdYW_%arf@Y-)0bf(UIvPK6QNQv^)_&C zLhG{$#{-3j%&kYxR8bJas}>@JY(}TTtgeAk3f1Fm2=8B_8xTn#5kQF-5?>#H9|v3}e-dLE4}i z_y#A`+lj|mGz1+|R*u55hj47ht*t z;TUf}V7de044=PXRu94kE-_jH121^|Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyh` z0S!95t$tL_t(o!_AmYYZFlvhTk(LMbxOYw7L-2DhN{Wqjn?IintfimEgZ9 zs320;g4=GY*owLftu!WSD~i;wT?Kd2EJV?bwS{!?xS7ZplgyouWPD*ZckZ0?aL&2s z-npiT0tO_FNjfd*h@=CO3jXV#lGY@xN_r)!Y-T@{wg3ahfk(hE+_etO0A~S93+5zH zA-SFd$CH5Mfa^e=^i&5XfLv6V-M}2(QxPacfvM1al|rHXG|kgH6+5O6xIynV(GF$= z*vbH?4xDIkc#S?IX;M;7y;ok+WTQ`c{@^)DXA&4)mh>XQ_hbI^CtZ&dg!}=}=RdOv z?94V`27!$PFx#3|X6eo3WRR-c zX7;+>zLN(QdKjJg(7#x}i7oX2rW$OvE>PW!)H7$8ru5xPxzM+On~^UYTCBb_TEZeQ zlGYuO2V4N20-F&aHi0L=dDjaoivc$zY25KjuViN5qS*fpV%!oYo(e+x00000NkvXX Hu0mjfe&Im( literal 0 HcmV?d00001 diff --git a/android/res/drawable-hdpi/ic_action_open.png b/android/res/drawable-hdpi/ic_action_open.png new file mode 100644 index 0000000000000000000000000000000000000000..41233c5e00e8df7745ad10128d9e990638ae14d9 GIT binary patch literal 578 zcmV-I0=@l-P)jwCW{jQW9C}!X+R| zLM1;J(r^3g{!C(B{PN30TP|~hztKCGK7a{6d=>0f%_N=l{txOfg(xPa3VzJQy*no)H0>S z!_?1zCdnHNb`yGVgfcA_JIPE5e}T8~B~jaf84XM(Wd`J%+A}E+c0ETmRkX%!nT8c3H`=!B;Ew`Qlt>vio`o}9{yr1MQ9ucIWr$e;^RU$ zwlIT-c8lNw8DKZ~7=zN!(vWi%_)`L*U7Tu#yexsx zi}sK!B@mi!52=U`NugXz5t_@9vo3j&#ChRI*d1&nDr;&d*~huVi$^TA7#LOr3#l?q zp+WK0UAGwR(qC74BtKROIH;8SdcYL8DbN%H{f1a z$JyK>38@M$VOe}T=#^bO$F!n8Sf$7f<0h8GA13Pf-mE&_;t}Sx_ND;-0c-U}X-5cg QvH$=807*qoM6N<$f_2yT$^ZZW literal 0 HcmV?d00001 diff --git a/android/res/drawable-hdpi/ic_action_save.png b/android/res/drawable-hdpi/ic_action_save.png new file mode 100644 index 0000000000000000000000000000000000000000..dbc044c9d8097dbc098636cc3b6cd9fee512be0d GIT binary patch literal 614 zcmV-s0-61ZP)x*s&zNyMb3Jo7e=^;kz5lGWX6?NviYkIpT*rN^VG}=F&n8xJ57#hKb^fvv`)~=1 z*jAoxJi$fuH6=5Fw-qF^c#ZK+LbUwi$mI-wM`Rj!F!AkHL)IHH=RwnIjov2l26BtuK*quqxsK1~L{J z6YA@gHjzolJS?%!kFr9sRNF}9Q9dNq?| zJ{jf<9ZW>nt2#YTO(uop5Z0-=UqQ5 zW(&Uhmnrnk6=oa0`9FWqUo>V1ek5SxsG~(;cH>tSOer%MECMr;0u%34b5Pie-x)CR zP7URa*;6Mbe-wH|$2pG-=YeUYGv%4VFk0)u9FSjU%5x?Y3cXFllyWu|3VovET0~Bz z!8E%w@r+l)98+9pN*S$$>7N74Bdkcm42X_nk-3j$Nth1B?wJy1d8J!5P%!2WmR8%y zSMeR)_|jy|-Kv-XdVz=Gbr(K233D5ZYGKxhPS!~5y)Jxg0%l27Ojvwpm~gP{{f+pL z6Xu3morx`cB24N`xV9k&)XmhGu;?g$VsVA*9e7_S<{B2H#)Ji*<8h5K9e7s(wFYl zziT($S(XqQIK?}L#ri-CO_WmSLO>NA|LXy@X^>6y=75aVM?HqD;X5+^;2itdLmPtx ztQLaq5;t~Hi7s5kRie#OhWd>7&nQQ*5-ua(PKM)PV}z#!ER`&5vz_53*tkL&k8>nz z1@+HN{$OJr7N(^suu1^h4QjthP+^>zECP)tT8rXOO@_0$wWE-Xl?awf)|LOWv053n zBhw8Q=13N*IX2!#g=;J)lEq&G?nBcmz9Pd={_zfqby4hv>SH~gw+)l?HcLHhWhoWO v;x<$2pqhk4z`A^NUge`Oz#C4`NS*luXXB$@T26hQ00000NkvXXu0mjf*@}>> literal 0 HcmV?d00001 diff --git a/android/res/drawable-ldpi/ic_action_history.png b/android/res/drawable-ldpi/ic_action_history.png new file mode 100644 index 0000000000000000000000000000000000000000..85f21277779bd3a801a27890c90434c2b4d5c465 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@RheW=|K#5R2ZuSN3u;ISMpfCzSN|#5m4tY^>IJbdRTQ!^`HsGj*TJC-y0e38u7mr=MPV zLTYdLTLCkPp6uogN3T}Po{PV>(yeSqy+hs0FoVN&N(N1Qjwz23;ToytUH{_e3a0E=*|;`t>XSD@LZ3^PsU^-8e-gW3pQz)aPui>-!mlJssx&>d z{5_9lmyF{T*ROGVgD;=BSt>S#sWw5^s)98lK>L7hfy|?ox0vc0pZ46WlR8#s%r%c` z^#P#*iKG4vr4QIGPBm0@-eQ?I)Bo&6RlBo>6YlPiF8%sienMl^>1}1{ZZ{n6p8L)C wDtOvYi)SkA6$10lRnOR*cw@VB@v$%L8qvBP+vL}M00tU^r>mdKI;Vst02G~^%K!iX literal 0 HcmV?d00001 diff --git a/android/res/drawable-ldpi/ic_action_open.png b/android/res/drawable-ldpi/ic_action_open.png new file mode 100644 index 0000000000000000000000000000000000000000..a29117736069a0f7f7f80a027c0fdacf67271eef GIT binary patch literal 281 zcmV+!0p|XRP)si?u3EUlVXr=Y79%z(XiD2f*%ez9uu zPKWJx0GgPj)RB+@D{Z?SqeKqRqdfPvx&u9X6T_CUJ1}sq)dLO6m4^zHpWTP|A!>e3+hSa z4DnHjPvTzAAgIUMuz`>rf- zm`~(nN7(|$ZGV6YZ(B%4E0weeFEGFi%ebbvks6!v3-_`AIuugV_5c6?07*qoM6N<$ Ef(Si?2mk;8 literal 0 HcmV?d00001 diff --git a/android/res/drawable-ldpi/ic_action_settings.png b/android/res/drawable-ldpi/ic_action_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..7a3dc396bc416455323b0f957dd66babfd6d6831 GIT binary patch literal 304 zcmV-00nh%4P)eFdP^ZgVE+65Ck!4vDw9DFd2+Cn{c32ZQ3;$L{Nj_1O==AKoQ{{ z!_MNex3lc-y=iB5zGrqnzE-P3(7`Pp(XCPwLmvF6UmL?To(<<6v!f!_G0fnl1WEIO zxlxfUHlIhjl4jOTKaadNK;SGzrtsDfImJW@tw{Rv+W;BQ{?sO}@Zl zc;2Xh4I`oWDf@|7$9DudMmsh)HwF7eSTPa`)^Hwqw~DWT97U0E_y7a!gmoJW*hUYZ zI4ng%;dQuifIG=#Uttf+m@EY{&^<1(izVrB)yyC7hT!APrx(Eh00006P)NklcgyTqtFS3Zh(L7zYnGz&wNoy&iBUlW?~%icOGDnRkl;)A*U`;z9w^G+lKK9bOlBoC(A-J(j~K_xFaiNyUyxzI$!Z<>q5 k&4VNoH_?(v+)Vy!uIRFHITwkKIsgCw07*qoM6N<$f+PWCwg3PC literal 0 HcmV?d00001 diff --git a/android/res/drawable-mdpi/ic_action_load.png b/android/res/drawable-mdpi/ic_action_load.png new file mode 100644 index 0000000000000000000000000000000000000000..659c27fc845848d3e2e3f31eebffe26defa95861 GIT binary patch literal 506 zcmVPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyh` z0S+k>K5Tmc00DYQL_t(Y$E}vnE(1{%#=mQ$*jn_@vMXMKtu&g7!~@X8j_@#*Ml8gN z1Z5$%o@r=KEaoB@>-EgeLv;Y7A07*qoM6N<$g5tK+l>h($ literal 0 HcmV?d00001 diff --git a/android/res/drawable-mdpi/ic_action_open.png b/android/res/drawable-mdpi/ic_action_open.png new file mode 100644 index 0000000000000000000000000000000000000000..9d0c7c070bfe82ddd4d0d099cccb93b882f57bb4 GIT binary patch literal 407 zcmV;I0cie-P)me;#5{5aCP7PrvI$y@?uohj^98~dz*>Q)wmyyVLHr*-E5|-kx1>XEz7s7p> z!eS(_oRNPJ53D6zP)&HnZ5ed~jd72usw-B7t9DWhurkccn-hu*u#sArRpApy#of@# zYec4TC^#X7Hyo(;d<3Cgoa0LP>-Ed$Gwh^@zX1`|iOjF+qsRaN002ovPDHLkV1fy= BxKscD literal 0 HcmV?d00001 diff --git a/android/res/drawable-mdpi/ic_action_save.png b/android/res/drawable-mdpi/ic_action_save.png new file mode 100644 index 0000000000000000000000000000000000000000..45c25de467d46708d318dd03fc7d22d40de9883c GIT binary patch literal 418 zcmV;T0bTxyP)yBeVr#5zyu2ES|Kx7nJM z_JY_jRXW2Q7I9q>zrq6Mah_oGgV>d2{l#42jLIfgSSZBj@vnk&7sS>t>kaFrN?XJw zE{gChwt@Ew&Qr>Oct~pvji19)MKTEZlL+P}KWgABHE^;NUDPaqmnxGCK5Y26AH zp$IL`rl5qbPIV~7k3-(!ak)z_cbD&W?|7f@EbxHx@JAWtHT{U+R5asRgl;k1_mL zE<9{r37h)nH^8s-{;K=oAU`mj3lGRn>||Z6VG{?T^e?{S6W-u)ZafrxP2BAbj`Sw$ pHJ*+HrWCZp6urj+9+d(Uxd%VG)(dF-S2O?s002ovPDHLkV1mwvtC0Wz literal 0 HcmV?d00001 diff --git a/android/res/menu/main_menu.xml b/android/res/menu/main_menu.xml new file mode 100644 index 0000000000..e6d0cc623f --- /dev/null +++ b/android/res/menu/main_menu.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/android/src/com/retroarch/MainActivity.java b/android/src/com/retroarch/MainActivity.java index aae2172216..2a1f77b482 100644 --- a/android/src/com/retroarch/MainActivity.java +++ b/android/src/com/retroarch/MainActivity.java @@ -2,6 +2,10 @@ package com.retroarch; import android.app.Activity; import android.content.Context; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.widget.Toast; import android.opengl.GLSurfaceView; import android.os.Bundle; @@ -18,6 +22,20 @@ public class MainActivity extends Activity setContentView(ctx_gl); } + public boolean onCreateOptionsMenu(Menu menu) + { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.main_menu, menu); + return true; + } + + public boolean onOptionsItemSelected(MenuItem item) + { + Toast.makeText(this, "MenuItem " + item.getTitle() + " selected.", Toast.LENGTH_SHORT).show(); + + return true; + } + @Override protected void onPause() {