From 9404548080b4cf30a79e23f5c7bc2dbc63ba8394 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Tue, 19 Jun 2012 07:48:13 +0200 Subject: [PATCH] Some menu navigation now possible - can go from main screen to 'open' (rom browser screen - stub for now) and back --- android/AndroidManifest.xml | 3 ++- .../classes/com/retroarch/MainActivity.class | Bin 2082 -> 0 bytes .../classes/com/retroarch/R$drawable.class | Bin 666 -> 666 bytes .../bin/classes/com/retroarch/R$layout.class | Bin 379 -> 413 bytes .../bin/classes/com/retroarch/R$string.class | Bin 412 -> 412 bytes android/gen/com/retroarch/R.java | 19 ++++++++------- android/res/drawable-hdpi/ic_action_main.png | Bin 0 -> 774 bytes android/res/drawable-hdpi/ic_action_quit.png | Bin 797 -> 0 bytes android/res/drawable-ldpi/ic_action_main.png | Bin 0 -> 415 bytes android/res/drawable-ldpi/ic_action_quit.png | Bin 411 -> 0 bytes android/res/drawable-mdpi/ic_action_main.png | Bin 0 -> 579 bytes android/res/drawable-mdpi/ic_action_quit.png | Bin 536 -> 0 bytes android/res/drawable-xhdpi/ic_action_main.png | Bin 0 -> 774 bytes android/res/drawable-xhdpi/ic_action_quit.png | Bin 797 -> 0 bytes android/res/layout/rombrowser.xml | 12 ++++++++++ android/res/menu/main_menu.xml | 5 ++-- .../{MainActivity.java => main.java} | 22 +++++++++++++----- 17 files changed, 42 insertions(+), 19 deletions(-) delete mode 100644 android/bin/classes/com/retroarch/MainActivity.class create mode 100644 android/res/drawable-hdpi/ic_action_main.png delete mode 100644 android/res/drawable-hdpi/ic_action_quit.png create mode 100644 android/res/drawable-ldpi/ic_action_main.png delete mode 100644 android/res/drawable-ldpi/ic_action_quit.png create mode 100644 android/res/drawable-mdpi/ic_action_main.png delete mode 100644 android/res/drawable-mdpi/ic_action_quit.png create mode 100644 android/res/drawable-xhdpi/ic_action_main.png delete mode 100644 android/res/drawable-xhdpi/ic_action_quit.png create mode 100644 android/res/layout/rombrowser.xml rename android/src/com/retroarch/{MainActivity.java => main.java} (75%) diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 7e450a1267..ce51a727de 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -10,7 +10,7 @@ android:icon="@drawable/ic_launcher" android:label="@string/app_name" > @@ -18,6 +18,7 @@ + diff --git a/android/bin/classes/com/retroarch/MainActivity.class b/android/bin/classes/com/retroarch/MainActivity.class deleted file mode 100644 index d5fba4e8682cc5870ac66c2e42c06a61007c2000..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2082 zcmaKtYgZdp6o%ge2?JrIHc%)O5UsXJXc=2?ZBx+_Y)uUXn}~u{9FjvaFqxq<6WV_2 zSAUDEUtCKA>RSE)f0WDjOePmDb+Jh1viEb|{qA#i{`vRMzX9BUr=d?^s_fPcPX?ZA zdgYq2Vp`68|%{YGG*96aBu+5)qMc7VGtovLj-C=?ss zj#-xLmVB0FuTvy9dF{ih6@6d$8lcO z-YUCJAfE>bjA24)yvS9%tnjT97`avyi9?`^I^q~e@M>De3}yvJd>Mo>PN0l9rsseU zjL;tCNYXbCWF_zTf$5ZGF$mRZhS@9KCDS7>ro z2I_I%*|Ev@1ZGm{&Jv-X-q+dwmvJD0H0CvA=u*4Kry_M+!*v18YJmkNQu)(dy2Q@c zL$%$?Ixy9^2tZ|*PUp8}Gw_1zM8)R=SuaXkmIGN~2f8ila8(427{*8VM8n5SK3xYx zblk#ifgyUNGV-KxujUiT;!_QG*`aot>lo3-g0LsFUF>Da&~|nl=ktQ`l=u!k%K;3ie_kh#aOVi0#a^+<+(zjdBL7-eS2YS+~f#P1c<=SOWW0(ub%2 E0RUCsR{#J2 diff --git a/android/bin/classes/com/retroarch/R$drawable.class b/android/bin/classes/com/retroarch/R$drawable.class index 62036ee00abf0bbf776024be96dcb922fbf8a8ab..7978de43c0098be6179b18c9266aca4647e1e7f8 100644 GIT binary patch delta 37 tcmbQmI*WC}QmNd;%sl3LCI)6k2ENSX_{8Lr%>2Cg{DRcHjr(si0s!1X49@@n delta 37 tcmbQmI*WC}QmOoc)I8>TCI)6k2ENSX_{8Lr%>2Cg!qUu=jr(si0s!7B4DA2_ diff --git a/android/bin/classes/com/retroarch/R$layout.class b/android/bin/classes/com/retroarch/R$layout.class index 78c6034104e9cef605aab513ca6850c8c46bcdbf..481d24b928e1e7b59962205bd890e0b3505c0868 100644 GIT binary patch delta 176 zcmey(G?$s{)W2Q(7#J7~8Kfq1g$QsJ<>w|9<(C(y7BSZ|GcZn!kz(WLVc=%qnOIZ6 zC^7M^N);1>Bm*l08v`Q)J5V1J0|$`LiNxmu$}oa-07+h;3Vkr2fq_+PI|JWFuoeLz n2{M3zL4iRKNP?6C6)*@f2m@&*1`#kR${+@$A;yUVEs+EON%#|w delta 143 zcmbQs{F{mE)W2Q(7#J7~86+lhg-k4vVB_Us;AG&M*jKZfkAJAuuV- RAOfU8#xOF7GKe!s0su1P4q^ZR diff --git a/android/bin/classes/com/retroarch/R$string.class b/android/bin/classes/com/retroarch/R$string.class index e0ffa75cf22584f18adb20b71e069789d6250a5b..a6f1f30f888d04f4301d8660e80054d9f45fc349 100644 GIT binary patch delta 13 UcmbQkJcoHhJ|m<0Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2iyh| z1swwfYJ_M200M?dL_t(o!|j+oYZOrwhR?ZkLsrxkHKU{wYZVb}L~K)t_!ClDiz3(w z{(z(x>_mTnWgwM>79v>0FEr6+{Ro@F4~RRv=Y1`l36o`K=gwrufaJik!_2w&JiO=J zbLWo8p8X?x-}!QR_+EEoqYa=9piQ#9^7h?S;~?x&&Fm!rn%VQgV6YXm+wBqn0gxnD zUcb3fHlN!m5IiVjG09buvj8j4TMH;j zk~xyA-us!MM=Bzssz(8Qj^h~)J=BQUy3@5&wzjr*u;1^0NMWQdOqMQE zP67C7W^rYO%fa7L%CW@k~ z&bdB-R!FTl=Y-_8E}UHt-``fe&WUsG7XU9Jk45Cr^uE>upL4ift;xB%p`kcVQqyD zZlGc7j(}=*Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyh` z10pp&ijVXF00Ny!L_t(o!_8Q~YZOrs{=S!kC>;JkjYTSBr(y^g!NNkD6lty%1uX(L zK|}=o11tmuNg-GXHb%6OU=S4q1%H&rV4*22Y&^)xorxrPx%n)d#m9l>Zf~>ez~k+E z>IHaNl8s*CqE@!N#!9k+fMQu00E#R zkWBkwiEd)6976cfseTCnNS=-Wej)k3J)B*LNjgk&mm~nV3E)h(Uo|7iB-OGYrlg%w z=&If52A>DrBlDS@6mk(j)xnh_phKMkD!D>4!xP+aa0!^>0A5JC)QOAd+`Z4TLL=#u z+pPKeV-iC%8(7andC21gD}c8}0P2hB0N`?x3P|oTvs-xsngMVRzys&fs-%4m3M9`; z8p(}Ae@#+m*Ue03W|C@>`U?f*pcbP%^{6OP$FkoGFaV63S*1`wA%v==i6lTIrzH)< zCm^d(Oaa*3K_-VJ1F+)nZvrq2V6>DWm`Rf7x+pL0TZbf#X9kGmV3KFjwk-hmX33%3 zk_e#L$?&?Vh({oKKT8iScuv{T+3Va5;5C4L_v!@6uZ83x=iIwLwbmY@tXjs(cayJG-g&e zv%Wmrj}@Pnox~#mPWTZgfTJOVR*@a!c~5?nbRmQ=UuX+U^0{+oA%t+_pBKdqlC?HK zcg(Er$#7i)zH$Q2Wk~9VUq0*I=p`On0B{7rK}nMUKKD>0MRFLx7GJNXN#m91&Ll~# zUPjV0`+POk{~<|B0LmHj=sU@+Y3}v_aKH)I1YkXmmh-XF>mRf-$!*@(^u%cZOCf|t bw~D_2x%qgDWIp0I00000NkvXXu0mjf4%%0Q diff --git a/android/res/drawable-ldpi/ic_action_main.png b/android/res/drawable-ldpi/ic_action_main.png new file mode 100644 index 0000000000000000000000000000000000000000..81b838512f2c7645ad90f81e74d11e606bc3a177 GIT binary patch literal 415 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 bw~D_2x%qgDWIp0I00000NkvXXu0mjf9EVru diff --git a/android/res/layout/rombrowser.xml b/android/res/layout/rombrowser.xml new file mode 100644 index 0000000000..1555563624 --- /dev/null +++ b/android/res/layout/rombrowser.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/android/res/menu/main_menu.xml b/android/res/menu/main_menu.xml index bdf9374246..63b1f18b81 100644 --- a/android/res/menu/main_menu.xml +++ b/android/res/menu/main_menu.xml @@ -1,13 +1,12 @@ - + + - - diff --git a/android/src/com/retroarch/MainActivity.java b/android/src/com/retroarch/main.java similarity index 75% rename from android/src/com/retroarch/MainActivity.java rename to android/src/com/retroarch/main.java index 957f352602..05e6a629cb 100644 --- a/android/src/com/retroarch/MainActivity.java +++ b/android/src/com/retroarch/main.java @@ -1,7 +1,11 @@ package com.retroarch; -import android.app.ActionBar; +import com.retroarch.R; +import com.retroarch.R.id; +import com.retroarch.R.menu; + import android.app.Activity; +import android.content.Intent; import android.content.Context; import android.view.Menu; import android.view.MenuInflater; @@ -10,7 +14,7 @@ import android.widget.Toast; import android.opengl.GLSurfaceView; import android.os.Bundle; -public class MainActivity extends Activity +public class main extends Activity { private GLSurfaceView ctx_gl; @@ -34,13 +38,19 @@ public class MainActivity extends Activity { switch (item.getItemId()) { - case R.id.quit: - android.os.Process.killProcess(android.os.Process.myPid()); - return true; + case R.id.main: + this.finish(); + break; + case R.id.open: + Intent myIntent = new Intent(main.this, rombrowser.class); + main.this.startActivity(myIntent); + break; default: Toast.makeText(this, "MenuItem " + item.getTitle() + " selected.", Toast.LENGTH_SHORT).show(); - return true; + break; } + + return true; } @Override