From a2fb1bf5f23db0282feb0ab5bf2f25fe1fdf1a22 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Wed, 10 Dec 2014 13:21:18 +0000 Subject: [PATCH] rename HLCompiler to GFTranslator --- src/ui/android/.project | 2 +- src/ui/android/AndroidManifest.xml | 6 +++--- src/ui/android/project.properties | 2 +- src/ui/android/res/drawable-hdpi/ic_app.png | Bin 1544 -> 2458 bytes src/ui/android/res/drawable-mdpi/ic_app.png | Bin 1162 -> 1502 bytes src/ui/android/res/drawable-xhdpi/ic_app.png | Bin 2284 -> 3672 bytes src/ui/android/res/drawable-xxhdpi/ic_app.png | Bin 3683 -> 6265 bytes src/ui/android/res/values/strings.xml | 2 +- .../ui/android/AlternativesActivity.java | 2 +- .../{HLCompiler.java => GFTranslator.java} | 2 +- .../ui/android/MainActivity.java | 2 +- .../android/TranslatorInputMethodService.java | 2 +- .../ui/android/TranslatorKeyboard.java | 2 +- .../ui/android/TranslatorKeyboardView.java | 4 ++-- 14 files changed, 13 insertions(+), 13 deletions(-) rename src/ui/android/src/org/grammaticalframework/ui/android/{HLCompiler.java => GFTranslator.java} (84%) diff --git a/src/ui/android/.project b/src/ui/android/.project index bde0bfac1..abf063e43 100644 --- a/src/ui/android/.project +++ b/src/ui/android/.project @@ -1,6 +1,6 @@ - HLCompiler + GFTranslator diff --git a/src/ui/android/AndroidManifest.xml b/src/ui/android/AndroidManifest.xml index f8fa83a49..a2127be9c 100644 --- a/src/ui/android/AndroidManifest.xml +++ b/src/ui/android/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:theme="@style/AppTheme" android:name="GFTranslator"> diff --git a/src/ui/android/project.properties b/src/ui/android/project.properties index 6e18427a4..3409f0811 100644 --- a/src/ui/android/project.properties +++ b/src/ui/android/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-21 +target=android-20 diff --git a/src/ui/android/res/drawable-hdpi/ic_app.png b/src/ui/android/res/drawable-hdpi/ic_app.png index 6760bc456650cb3354647f5ec85ef4ad7e57e7b6..8d9bdd820089406b216cdf2964f1037787954821 100644 GIT binary patch delta 2389 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 delta 1468 zcmbOw+`%)!nw$9#0|WCPM&?OJH&1j^uV-!bba4!+nDcf{e1~|b$Z`Ah|2wn2+jffH zjB?c5a>M(X^R8bT64@M6yju0W1NgrMIG+3_#vwM*!{t%8qHD`lu`T-|Bs9BhHL~|! z341VUTS!=%%er^F=Eyx$FMj^+%%8Nn{nnp%?|v=LR#*IgPVqDA^19;ZcZ%1o(7HaM zXPH~Q^aJZCsYRhnWOr~!@O@!8-H^6GbjGSJvsjKb$T!Y!Fbr9q#-%OxR6u1D!wYsf z)@#h=43mOSiMs4#xB`AMT`5auzGc+q zV&+=R6?LgFAaU;J?7&isCYPwjO@97IXa;kqeGU`I_IKc|ULK&d`UFt;}4)p(T5l7c_Tgubw_b ztu>cxx)9IYup8?)xGmIl^($>!^j2KUW?_L*>ymg8Gm}1r7hx8&67Hn7?&UgdeCm{Y zz?S#TT=7c)aCmlB>VKN;qj?H1f-Hm==PVCPdwfq&6H$vyYq_RLwt$yNGAW6jCi`hSC+pD;d{5L(6a;`q|n ziUsvP5ldxP#1$=D?51LU#${Hc`Pxf`37dn9Y}{wL7iw=fq$Ta}^*htsk9;5dXPii4 z(x3N}^)KhD+1(qHzS$-prPv*bDWQB=lO#AyfuLu6!Dbj7@e21fo<%Q9? z|BUxEj?4TPaKCW*+E4ZsaXN=3-G;%V#(szYT%oDdt-rA<{Nk%DJ z@a3vo_gYME*W8BCir z>P`2mC3v@e3*RU>@%1LHO`N;#TiH(w4LF&x`JDBtE%~N(=F!hra&QVoa+OGzPCjsQ zP17^2GlD7o^91G7Hubi72CNS)U*zLl)9QJlH|%bHs?;OxGcWjNFDOox5^84kNMh)a zoq8$e=Yvwd;E8*`{dE`QDt_S9w@p8k@3}|y5vh9L3F04=S@bKSt1OoqaQ-^I>h$-s zLH64i?@wQ%eN<4s)$>B->UA+qA^eMPc^hc2D|@q{>iwEa|2AE+pp-9@*PxpVZAypbY|NRuE`75uiaJMJ*(!dS_{j{ zKH-*Yajwz@@%1;^ezH}|rSvb_w~6N@XEkrGk$bgj&$IPhvll$R_VaNh>(rjV2TGoP zH~HW?_1k;t{r!u6#fQ0GoO<;@roG#g9aC5IrHDpIxr8zEGdqWLZxN4V$zhttkpJ{! z@!6OvF-wjd1Fvrje&vKU7V{R~Px@wbUd%;oT4GOshjPY@7t{aLD>c1eQrS6^Wu+g} z?=_bkUGnsgDxH7e{-gVN$9MLX^Vs7ydYOkheR?K3DOsdhU{8LB+st0!J>Q=DPKn&) z9#|?>aZoFkizl?`@H5s+vFldFGwoh`$u5np{1^YktsQsf?v8Ie(fx?|WOu)e;bQB! zvzP5xPf7|F>{3?O6MdNP>s|kDb>{+y$ikC4M<-04a^};*--04qx@xkgY%O^`+PS9g z_Fqx#?$a#%%E|f8vXotl$0tuYb3vipbMIHd$B9At8FOZD`S7PI-7%`-%7b5KVked@ zR+Q%cvB~sk=7Bifw<>q+(x>J73hupp-OT)Ci{&O;zd{z*Ef%*DIG%)r3F;OXk;vd$@?2>_U!vs(ZF diff --git a/src/ui/android/res/drawable-mdpi/ic_app.png b/src/ui/android/res/drawable-mdpi/ic_app.png index 99aaf67bc964a12eac2c12d2430941349a89d315..923d0fe9135f5dd3d360e726ce7ed03da80b13ce 100644 GIT binary patch delta 1424 zcmeC;yvIGkhU+K;1JhB)&TIAWC%UQEvqpQmIEG|2UcH&0b2VI&{lod<+d*7c9<8{c zkX$cPXec<>G5NxZ=wnkF++_ZFKI1k`^EP|T9dqG`Vdt!zNTWa7XXHLIdEA=E;{HhN zMoL!Gj-!GdCt4aed`!Qz+sXU(?P|^Ga`AVz1!SDw`?hsceo@?=-`4w!_uVg^_uTUQ zd&~NXL7&3h(iU;{h=+;`{H-uuv{CudtC}P1T!QA?T(_+0JHcbK{#MOn(}f)!W>K>u zBA!e>=>BU)P1~W&qP->GFPgVXe)ZuGS|oa2q;lKD+DsXhV>$_?F3;q|Qh)eOe0F%x zj`rztX}8601-!{m{}sRTu*#MD=l9Is`L#;SFEvg6b$#{E%wR8BQDINb&?^FS@5CiM zSDaVVb2KBw=r~VOLSkF>_c_xX{|Y^O^FW>T-{i*!^U}hOET42Pa^308F9r7hxBC1m zyd+}NR2`12XU4_a+MnONN~+xXc$#gXc=@v%KULxnJ^3gk?|CA2&+@71MQf}*F7IGf z*!81un(zE&tTVHO>g63h4x7Ex+_1XYGFfcHoLPBtmS^OjO?|Ux)#^GyMN{d>dFkIX zl-y!FC;$1g|Bn>!^zI*(GDgxrlJ>`&gsUv*UB7K(s#vgE)1RG6bw>~FyfR%^;WV#h z+)u{qv3{E+&q|##Q*`OemHzQ&Y1xgeE!;&5!={y7+ScKU4?0}h)mx3rmN!s`_D`N(c8Iw}%B`Dw`VTE=P&%HS zx$cq5f^8)l^Hwd(baPqO_w4;-*@8z`ytg%4Ue&RR^tr<{gv`-y|>dBz8ub^zUG=^m2uzQ{*09)T~Lg<`q6s=;GpHQuw~^+AIH`?KKx{ z{GJP%#hslS{zy+I<(rCFUH4Yz#L5%usa`AdLyw%V-*{S;4oUMR?AQ_-8Ng9sd}u zl(fUL|MSixd(IbMpYUAyO5&@y=bgfLZ0ALta}1M9P|cd7yTAWh+uHwIihTL2uT9Z< zjVrUbdX@z#ky7(7>S^6ZHEou_nj1$B*oTn>}l z-Fkn?lrCk#y)!gZ-le`P{5R?G#qb$rn!X+{xv~rA-Iew>H#J@SO~1Z8z^8U%DC@tg zCy(p9W$7^W6@>PcMw+cp+Gmutd8$>~TW6h|Wbb*pckfsU?JQzdu$nRXaih)udx!4M z2wL~T&{f>T=FD05id6?rvxa>!_}~7#<uu(5mk|5IJxr|+BZZaVYx z?HTVoe+Tz^YFFIP)!93*-}m|5+Uhq)8z1yCad*whNeSk?+->r`Ft@G$+oj)Z*8fgE zTmO-1m$zP|+pY&am=LHy#C@4@Q)`LT+V4>3#iOoUmZiz`VT#rb$ zvP}GOqG7UtZ_=6fi&pI|{ayC`?W^0{jejoO5nHwbxggdB&WHh}!M8`EdGuxW=cyrltmhGZjB{d}0IM*et{iZsf>9NOtSKduK7%LfW@W^~o zbw2Re)prx;jQX`q-ke*Wsibj2l$cYJ+P`aodA@)cG0oVH2tIBH+dey9IS zd8}PoYl&3FGM}sG-TEYNl3(dV(3(o#(}u zJ?5Lg3skve`@tsR-_NIQwJTf17&j*-+8Tac+Lq_53!nPvRA;ri*iK zW^Z6UbMNHD{V$*Li>~D4?D=)yxMXH^_92!6%MT)Hr;VTZSNxpp>gB|w{O|j6H?cL- z-ZE}VKfGkkhYL@&X0Bye_c_)6%7d6>kBD{4O@E(>Q;646d^vC8f;IBC8+bRD+?@5G zQf6~~(5H3A0$VtE*i-+$Xq2_9f0`H`dUR<-*b$Kn-%l#MZ2Yj6pLw!v_O!l)ZJak| z1Shj^IBRduwdB9k?uJy=Hyj5u3b?9Fp9REP9-MdJSwh>NEz{p>7c0$Xo;0=GqW$%v z7Uc(g+V;OUO}ulfTi~IB-?HT$)pBv`pVfp_)H;_k`DJe9?yGqIyWrr(Ai4UZA%6MH z;Xb;_h0|+}?#kNzFVdQ&MBb@0Oh#+ A&Hw-a diff --git a/src/ui/android/res/drawable-xhdpi/ic_app.png b/src/ui/android/res/drawable-xhdpi/ic_app.png index a6d509f713f3111ca182bc654621cc7ec78d0a8b..f7eb066825c2beef5b37ad3f9f539cd7b860e7ae 100644 GIT binary patch delta 3612 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 S!@$76;K}al=d#Wzp$P!OD(~e0 delta 2213 zcmca1^G0xj4Obuo18X4TttUR~C%UQEb7XqDIEGZrc{{hdM>bUUxcz?J=*(_TUvAdv zOl&!tE+XL>PKGR31WZ_6W=--i6zO3R7IyvV-P97^#3;<4$SiY*w`BtS#G?dPg_z%HIE{@ZGN6#pln=eLi>R_jBr&H{YD8{FAn?_}LxH{`-cW zSL&y@$KPc8Vzre)wb1N> zIC*Lo^BFOQ)6$6o5+@X|7bb9jFfm}U>HCt$_w$+4Po^2VjCwgOOLwU6^7zL5x-e;t z>#g8|%865y8zSvDaQ$H0u;ee>pZSGz1hy;g4QZ=qd@Fk3O~3=M2UZVmd=r)F{(3;y zXLDKm!cN`LiIf2DY6 znH}Id$k!;;^0vve>1xwv7I(H!GM|=6&MLaca-7Rf_s6P)wGZaDnAvFlNVxcY`3Y(J z@DHC^#P@i9kgY#xLB9?NRsOJ_5AUvk{JaZtTcpRu3uJ43y^ zyVVS{(?6Uir7eGO@2#C2Yo158i~GY{TjkB1(k5MLc+b3VevI;g)YzZ5GMPWJ80;4L z?yYbl?t#*hy_Hf|y|;)R$Pp{3K5_G^hjj7Q6~{Y*nb#fuzw~$YlJ??l%b$0M9mrAi zYfwl&aJ|c5#r2F(=DcI~KirGmU-d~bhGFy19rb+66|5VjyNy;{?^wmSx?$$L$Jdqj zhEA}xb)UizUe)(jDfxZ;*^)m@Gjv(~KF;~cd8wXz>x$zXs~N*vWzIkSyjy6-*Tip) zJTKV|PTTZvjbt!CwE2>7IrF9ao5UhG&*&W})!pBCQ@A(r>W<9*<8K5XlqMLb#h*#( zPEYu?XF}tP`qQ81@CMvkU~?wq^N}_4)ikPo72e7nOswQPHUFih8QUMN$(OD^%t?rQ zaO0HQbZ;3wzCZOAd0DkuHB366WvT^VzTMIq(qlO<`R@_=tDlzgOV7$ZS;Bay;Bk=u zp7cv%0m8l;*lHv!&Iqp;TcFUy^drtbfIC3Kk%hz)A z^_-Dg><1U|b)zqklNt}M(FH;z&C7FpR-@B-IT>eOoj@z#@#*3C4X*NX48(bG& z9?W9V#S_2eK>8;m70%#z$M(nnjoyhcT21o%I_*=U90^si;=7T(09j& z)x5lEv6JEzYfNioECh`I+MVC{e~IZa^#hydCI3C3n#sLV!k;mprO$R&Lg;_y#{c{b z*}>6|XZ|#e-f-RcbIy)0l7&CduKE2(|IrTz$) z_%Dlo*4{Kb;dR)7<(|74Dugxt{s(F#&aL-K+`Qm$ns2#UX8u0!-O8`ewrlKPn701H zAJIMB5)0y#CrAh0UG=@P?=1T|jT6)6sjOlIiD{VW__`$vlsk(pu8KD2j1G=T`MDb@V)*c zp{)9P!I>GhJKoq`to^6N@XmkBfwjvzfBa^j!Tb2TqzTg;$G65BqMpmbV|wfL&Lura zuUs?pt?MIhg}q#B_$+tNi7R}NXvV#HeZn@z&DI9o#W!X8MQl5_yIXAi7xvP2?$K|H z&V_DX{rhazo>P}wOx(^0{84mjvEC#Ra+86%Dcot@&pY+sI3M)PRKFpmc&N5Xa_Rjo zfAanzczcgMEZa!x2PzNjJg|^6r-JMGoSN(=lg^h{-sXHa+}XcpM$BDHhxXj``sn-@HlE`7 zFYbh7?OpnlJ<_gV=UM|I8`+2SV<&Tz}eY&{4fS zJyqrglTGjLm;K7Ex&AlGR;fA&T(8idB_#H^N;Uma)+v`4*?(kN%^n_G>0ZG5O-yS~ rf9h7&7mQX{qrI*Na0eK@XFODJ&{IHr?oD0>1_lOCS3j3^P6ZtTuicwD_wbpNNjuNKdH;HA+;g9_qH}TC_1`|*WUozM zD|)oBUMGCr+t9=%`U=-?gz*KeW7K5VxZW^@c}lj!DaKQ#3QrlHN=@)mu4PnSsnNA) zU)|l))g7zjw*Ps`A|>6a<`ug-p>xwy=_|5l&g?w1#@B1%Dwl_)QLSx8+Pf>3p6N;p z``0+t{ql>g2}fW4{>XK82kQ#)1g`TRcU8(nonB}v6O&N?y<=BnUA#|lYp7`4N|l1C zk=vT)zdLOd(&N0~n5YA%$?VfhugpEy7;L$w&Dnd;+5>&JKTIraeP+}fo1=9(h)XOh zu5snxzY~nkmlo6uf4_IKIsMWa>17o)uG4}D?}?YVATpZ@G@(mj)BzKL7kPRri8f67+;)8X|OCe}QkQBa)BwP4Lw$A_YPv(L7_w&2|Q^8VD7_m4czj`(Ha zt^a7{@(kDT(3iXm=A9Cop5&ddD*keimzS^Z()FL)$_sw1ld+r1yoljJT4=<*6Z`L< zsIODmu``hW(hLTT?A&$fw>tlv4LPUxv912h{Hf+2KDYmTr)hKLV^qYZ3rm*X+La=` zc>DL1m`MKhH-n}$YW&{SGV}j|g}+%|fB7c$Y`J_~VyyA>yJx4?A9Y)NV{dO(!=?u| zhwpJ)RvRsMKjZO#SvT+Loo~7FcC}1r6~EBvSIc~Pa_Y@>%lA(IxJ1W;m2sKKidjCI zSA#w)_gU4q7%%^H?Cf2^sty%@b<>d zr`McpxcrAFKK78~4dcuwm7a_JJ@cFlS<{!i-Za?r7z$zA$r} zd+V{UbLL*Dc6n{{sCR}*N;{?vIpPD#D9n7uujKQShiZ<%^;?BdE)g3>z`ja z^61U19V=H}&C6Pn|3{!XWcrS0mY&jYDlOHwf5|p=(C*EDq5t;FCT)v0z8-UO&BJYO$~P@cwIhSl zVwVZd+o$qnTbcMV*D{YYKX+`k_?xp@gZUEQ4bJL2=Oksy#{e0f@4-a$JPt2IW zly$A3>e&40@ef|PzM1^v&rQz)o5X`JS(lj9-=dB)Z!%}nPwEK&V$j(_RJ2~AfHDwnql zBzW8|yzy}5^FuzW*K1UFtZ6+dJT-dmKj#pET_1y6^ZqaLFL1HtPmj6vxu0cqoYbms zGG-NJ$wBqX;c2@Toc=dcS$Mjsapj_-)tlccEWP`0=8dI&N6&xS>Z70gHF!_y3I(Y? zE-||UU&QjxvYk#ZD7a)gcjAsUcV6)<=oQX3iIqsW`}g{vY$>%VE9)mNZf9Dwa9za5 z)o1b^{}Y+VCTBUzTyb}IJQyqBG}ca`{c<8At%TB~}|kcDqq`#hUII5uZ^ zJlr{TuJw=kBJ;v`*2jPI-L>#?aYfs*yRC9Ja&&gh{XR9*MI@DAJba!;_*StKdFXsQGzwD>y@*X`ZZm_abI;bM< z!K@{-?et%o@_Y9Ab9Hx{^IYTGaoOmGc$~vqt#h6aBainB zRg|51C|Ne4%ac7-Ow8_7<;ySb>i+YjlP)k;HabS%nxo<;I{(3fpD|3iHvi?$35(q| z<>rikYOykQonpA_iBmbQmv8@gXI#VS^~T=Z=0fY*H5c9nH*eZvxwGNW)-yNjr%NlV zg=XxVR4n%-^sZ#HrOn|L7JZL3y0o0y(zxH8e)|1mi0s<`LUOMdGY@F4)wHR1db|0K z*-X_B+~;c9wBzx}7Cjlh1cvBk-9W&#k{V^0-A@0~t$m z??fNJoqVeN!@ly*#tW}sRV$Bu9C!O_uYc_IqJNw8RQ6O)TfcAi{L|Gj!d|y|0;De1 zPkCuwtXQA8=efo@k)(Nhj+-`au@%#BdU^jxh-S*3$_d?JCA-(^HNQwM?#;^$=9$8F z&OT-R;|M9ko%7h!Tc=!MJIN=p^Xp8DTVdQH3!ll(kvFtl_PR<>=)lRx^Eg-3F;9t_ zFCAgfyT2*)PL1CF$-CEauFl=)AlP;MgnrbW+>>8xVaD2+E>IdjsIoHbAHT}!C_^uSX5S7Kw{^WLKy)}8SF zv;D}g6O5;p<~Jybe1FvOuA zPH`7i6n$M_7aI|KZxO+kBCX`mIOzmM`>K&v3O>*5=^n#K$e1%>GtWHul6m|Fn%O@ZJ9A-CdPm zQ|bikT>~xq9`8_ZPlM*yG)5X?j1N6`QZ~ z)+vg%xPCA6kLtCWN$WZ;^%Sgoxj^=e z(X|k+3n4ACH`GKN>Q9!P`#8UC^Kpmb8!mO9Kl)tlYE7QCYgYt!@Zq#snX}y2ajvMH zbVcq*?1^(PL={fzYs;=_+ErkY=lJ63GXY;4(KL02qb0TTrmNhPtYsA0zF8=1H{&VO zk0J{VbQxDPPoK~IF=0M~A5@cpw8pISJeLAJ+@UN2k#MPBdU1#=~ z%0$nMUf8*uav_RYMziuIPmZ?-zF%a&=0GiJ(PNc_6fZTqIerkXE1MK8X{)JXFFnhh>spoNfV){~NZ_|VsE4X&qovROZ z5}J6|!g0pY^NLdYy8`Z5zub4cBt}H%g4nz6wax;IUx%CI@(AvT{PQ$WaihljbN%t6 zEhh68FPM0|PR4IZ&Dnn(e;HTwoOAzaCUWy*mfyts9!}nGQ=dykF8z4^?i*uE9=T}I zzHJr0e-4K+oZ7MR+~c2>(&rEA)p!&nTRJ@U7xZc`l;aYerT?(H%JcbKe;Hx*|2rS| z-{B~g`Js{TYFM89*!|_CW&e}zznsIOUwqg+a&h~Q_J7PFZoilBSSk~?@>cu)$?TUO z`wDuof65fmHmQ$4arKwQ)S}hq_OFkw*0BnI*~R0>rc=8#Tsyot2E|> zxAvrn3@!CPvzni5yf7oo|6021_OF@Ok6#qKEwn#`Mf*yb-E{Sh0rgw>=L=3_e7^C* zjnJ)MGvD@qO_a{7a!QbVdq3?fcMS7n%TF^69-8H?4G7Oz-V|_rqE_n?o-FC_DYapr z=4Ss&tiACqH(HBnVy^t7S-&mTw*Bnh`6uh%H^s2!zmMgl*Sam`dtNJDkv>VKSm zdS@Qv`}v1BS6ddVuQNJVw($kmXNTD6zlRrw#w6aotaxy}MvL(6wO2}GPpvsx!yH(z zo_+qg(ci6h+mfGe1UEb`on?#ad)V!5nPOCZ{&6?|=L-vMBwa7=xGD6*=-jWAXB%b; z?&{fcb~alT@64}pOZf{k4d2v0U_7^f;? zuG-$cru&#i*Ri7~+pJsEjkY=|2hKNf-V$6?U(EiaQqb#s@gWnx=FmHzp5IZ=k-Pdo zH;3(oeYSz@Zo6~oLH2hKTvwUdtt@+)$Bm~X`$YFl%_DV_-Bw&teH&}i@I$@zIp4Q8 zNxm}EHtetA`JH%f+r8}vGu}i!47leiU7?Wq_BlUK8yP3)f? zZ|AzJr_%R$hY?dMcdozerpj~T#g(}cnQ!=Op5FcAR1mxOT;Atja;k4|C zkC!L73yIIHSGqn=C2L#t0+0a54Gm$P*z%a*@Ad;MaLbUoAaHEcG2C)6ZHF4+Dw z;$8efUW3lXd5?C>b3C(e&uE$Q#waZ6nCIrhS0<;;voW)Ib9UG6x3_cdvZemhVh)s^ z)&HdUWzYgong6AEmgYaM%PdL^WAgu~I!)(Mm56m@HDkIy@9V$YPM0o~I>UKkOZNS5 zHoW-{55IQaenF*g?~LgG^_`hT9c{jvHu{@V7|q?UOubpcoL;N?=JVx6@}FaCGcPcl zI^ryw5$X1qvF1x?9Z#vu=k+!JYsw}#n>_J)71yvs%blML; zvs2H$mB_aQeb!+w|CEwu_i1AAp^VS#oX%LP6i;@ZcRVJy^TLh>?s*SS8$RurXB(6$=1-espk*t*`|gSO z@(o(GSymNaIt{dAjGX*;2j(@VtU2fXCsO?Uvgi*I1+17%)dUqmI6xTfa_Pyv%;2q5rpS(-9wuUyVlieP5 zuBzH}X-CGk3A1XcaO)M%>Zvk;4Mx3FcWrs;6kdOEw?&4kdH9PndfA!J)mIK_VQGuUYu<%ic4W-l!RWPK`sm*kv8OrT-kH7bvR816`KJe8=gf+jJ9o0# ztdto^a|3w;LX*WNt7m0Bx>j~n?s&n2;QE@K%~vBQoYJ{}#QvUy(4otJyS7O$d&r={ z?8~_He@dC{^R(ShJnzn$R{Z$6Q_%mo&hGh>x18;WoEyj;ps(QT?QlzSw|>I@_Mau( z^(V~AT6@>lET6akZ?3_6)w`Y_{<39hFsx!y+q%WH{>j<1F<}esqNkh1{nCxMuh>+0H>uA^va+gN(RqH|v$yH>CCB+RLvB8`a`o9cdGTt7 zTT0hfY2ExE?UKn^dfIZw#Lu^Ou0GT@Z{1p-*Is%1TJ{UDv5KqmpFGpETB`KH5>>Cf zOEUt}Jo5q{v9+jg_Pcapescd~%M!u%GY{4toxr%WHOXx1&)U|jo{?9NzS0Xb-|#E& znt$5*$&+$Uy)S;FsW`oU8S_;C0IR7ttqphg-84O;Yqa~ooDNIVJsaDa7thRZ(`m%hC6hyAzw zp~T$iabn31?O-e8_ougQF-vBe6Ot^oAY|st-d8(PihYv2 z7hIZ=^!d`myDM#HTK+c54=F%vp7V4HJUA- z`_y!Gg^l+6?HLz7viWRPlX3Waaodufo^pq6%VZYBFkjlBKIN%YJa`!Xul@m+phxCP TUxFAI7#KWV{an^LB{Ts5hNeK| delta 3624 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 diff --git a/src/ui/android/res/values/strings.xml b/src/ui/android/res/values/strings.xml index 26db54a03..ca103623e 100644 --- a/src/ui/android/res/values/strings.xml +++ b/src/ui/android/res/values/strings.xml @@ -1,6 +1,6 @@ - Human Language Compiler + GF Offline Translator Microphone Switch languages diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java b/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java index 0bebbc3ea..e5d691820 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java @@ -33,7 +33,7 @@ public class AlternativesActivity extends ListActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_lexical_entry); - mTranslator = ((HLCompiler) getApplicationContext()).getTranslator(); + mTranslator = ((GFTranslator) getApplicationContext()).getTranslator(); mShowLanguageView = (LanguageSelector) findViewById(R.id.show_language); mShowLanguageView.setLanguages(mTranslator.getAvailableLanguages()); diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/HLCompiler.java b/src/ui/android/src/org/grammaticalframework/ui/android/GFTranslator.java similarity index 84% rename from src/ui/android/src/org/grammaticalframework/ui/android/HLCompiler.java rename to src/ui/android/src/org/grammaticalframework/ui/android/GFTranslator.java index 2e5b16df4..ee4cbc092 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/HLCompiler.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/GFTranslator.java @@ -2,7 +2,7 @@ package org.grammaticalframework.ui.android; import android.app.Application; -public class HLCompiler extends Application { +public class GFTranslator extends Application { private Translator mTranslator; @Override diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java b/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java index f448efb44..1d0bcd592 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java @@ -103,7 +103,7 @@ public class MainActivity extends Activity { mTts = new TTS(this); - mTranslator = ((HLCompiler) getApplicationContext()).getTranslator(); + mTranslator = ((GFTranslator) getApplicationContext()).getTranslator(); mSourceLanguageView.setLanguages(mTranslator.getAvailableLanguages()); mSourceLanguageView.setOnLanguageSelectedListener(new OnLanguageSelectedListener() { diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java index 58d2e6518..d621e2f69 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java @@ -41,7 +41,7 @@ public class TranslatorInputMethodService extends InputMethodService public void onCreate() { super.onCreate(); - mTranslator = ((HLCompiler) getApplicationContext()).getTranslator(); + mTranslator = ((GFTranslator) getApplicationContext()).getTranslator(); mSymbolsPage1Keyboard = null; mSymbolsPage2Keyboard = null; diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboard.java b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboard.java index 3eeb1be1e..876f660da 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboard.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboard.java @@ -24,7 +24,7 @@ public class TranslatorKeyboard extends Keyboard { public TranslatorKeyboard(Context context, int xmlLayoutResId, int modeId) { super(context, xmlLayoutResId, modeId); - mTranslator = ((HLCompiler) context.getApplicationContext()).getTranslator(); + mTranslator = ((GFTranslator) context.getApplicationContext()).getTranslator(); updateLanguageKeyLabels(); } diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java index 8e05623f5..943c48d35 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java @@ -20,12 +20,12 @@ public class TranslatorKeyboardView extends KeyboardView { public TranslatorKeyboardView(Context context, AttributeSet attrs) { super(context, attrs); - mTranslator = ((HLCompiler) context.getApplicationContext()).getTranslator(); + mTranslator = ((GFTranslator) context.getApplicationContext()).getTranslator(); } public TranslatorKeyboardView(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); - mTranslator = ((HLCompiler) context.getApplicationContext()).getTranslator(); + mTranslator = ((GFTranslator) context.getApplicationContext()).getTranslator(); } private PopupWindow mLanguagesPopup = null;