From f959ef99ea4acc3e68e7410058e3500d9397690b Mon Sep 17 00:00:00 2001 From: akwizgran Date: Tue, 6 Nov 2012 18:34:55 +0000 Subject: [PATCH] Various layout fixes, moved remaining layout from XML to Java. --- res/drawable-hdpi/action_settings.png | Bin 0 -> 1540 bytes res/drawable-hdpi/alerts_and_states_error.png | Bin 0 -> 1412 bytes .../alerts_and_states_warning.png | Bin 0 -> 1618 bytes res/drawable-hdpi/navigation_accept.png | Bin 0 -> 1335 bytes res/drawable-hdpi/social_add_person.png | Bin 0 -> 1783 bytes res/drawable-ldpi/iconic_check_alt_green.png | Bin 499 -> 0 bytes res/drawable-ldpi/iconic_x_alt_red.png | Bin 552 -> 0 bytes res/layout/activity_add_contact.xml | 5 -- res/layout/activity_codes_do_not_match.xml | 5 -- res/layout/activity_connection.xml | 5 -- res/layout/activity_connection_failed.xml | 5 -- res/layout/activity_connection_succeeded.xml | 5 -- res/layout/activity_contact_added.xml | 5 -- res/layout/activity_invitation_code.xml | 5 -- res/layout/activity_network_setup.xml | 5 -- res/layout/activity_test_bluetooth.xml | 71 ------------------ res/layout/activity_wait_for_contact.xml | 5 -- res/values/strings.xml | 29 +++---- src/net/sf/briar/HelloWorldActivity.java | 34 ++++++--- .../android/invitation/BluetoothWidget.java | 48 ++++++++---- .../android/invitation/CodeEntryWidget.java | 2 + .../invitation/CodesDoNotMatchActivity.java | 27 +++++-- .../invitation/ConfirmationCodeActivity.java | 51 +++++++------ .../invitation/ConnectionActivity.java | 34 ++++++--- .../invitation/ConnectionFailedActivity.java | 50 +++++++----- .../invitation/ContactAddedActivity.java | 30 +++++--- .../invitation/InvitationCodeActivity.java | 17 +++-- .../invitation/NetworkSetupActivity.java | 36 +++++---- .../invitation/WaitForContactActivity.java | 34 +++++---- .../briar/android/invitation/WifiWidget.java | 55 ++++++++++---- 30 files changed, 293 insertions(+), 270 deletions(-) create mode 100644 res/drawable-hdpi/action_settings.png create mode 100644 res/drawable-hdpi/alerts_and_states_error.png create mode 100644 res/drawable-hdpi/alerts_and_states_warning.png create mode 100644 res/drawable-hdpi/navigation_accept.png create mode 100644 res/drawable-hdpi/social_add_person.png delete mode 100644 res/drawable-ldpi/iconic_check_alt_green.png delete mode 100644 res/drawable-ldpi/iconic_x_alt_red.png delete mode 100644 res/layout/activity_add_contact.xml delete mode 100644 res/layout/activity_codes_do_not_match.xml delete mode 100644 res/layout/activity_connection.xml delete mode 100644 res/layout/activity_connection_failed.xml delete mode 100644 res/layout/activity_connection_succeeded.xml delete mode 100644 res/layout/activity_contact_added.xml delete mode 100644 res/layout/activity_invitation_code.xml delete mode 100644 res/layout/activity_network_setup.xml delete mode 100644 res/layout/activity_test_bluetooth.xml delete mode 100644 res/layout/activity_wait_for_contact.xml diff --git a/res/drawable-hdpi/action_settings.png b/res/drawable-hdpi/action_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..3e4580e0534c913abc5560067866b162e2972945 GIT binary patch literal 1540 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVi)$k4*r&A`yq$-vFf(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq1OnfUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dHn#w6 zH+MC{Z5~u_3U0R;;B<>V&@uX;s6~oum=G}ifSB-v3*^9)erg^ty%zx!wp~edHv^DGL3_8x3M>HM>74`sP?u&i^;e1!olzNpA@uje7l2lq4t4XhL7>= zJysKrgx(i;l6IN5aoXW9cGIe#*Cf7arL5B7OBBc`es=Upt>hN5O|NHaJrMe!k{G@$ zYszwF-jjDG{ynfo!2kRLVe3gMn;KLdCQbT$YxRuJyO>#L&wJTx^K#Cj7F(-ou{6FE zi_lflZ8qUEk9e8(-52l*sF9izn&)9*CD^du_ufqvr42kcn0pM}f2k*&b&UJNu#E9} z&)Rs&rcaM1gs=Sfc5cLy)?FcH$xPN)EZ=YOc5Inoqq_YwCofaK3oNTbR^G_p zTKbZEs>k^!5}JY2wuGyx{`u0n=?d4(V$El7tWN1YODUaVWZI=&_G+_!%Jsk%>-|dJ zai=cYH=#u=sBoqEuP?2~Wc9wT+j1d~p(<_imq{z83aiVSp3E@VV*4m_;f}*Co<~`9 zI-Aceu?#+T|JXFuN%~4m<{`I2wu{}jU|%p-rR~Ht#XMav;T4i|?3O(G*Z<l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsViq(Z$To*xbz2$-vFf(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq}R#B*u}ue2&Z09V#qB3+U$~Alv$RV;#QQOs{r=2 zRVHq?nBX)Isy79jTOj^0#i>^x=oo!a)FMSSObD2MKumbT1#;j?KQ#}S-iv?~)i9G0a*g?S8$EUmM!s_}9tJ(iM>~}cQ{6JmAWyQC3k6b^oAn-yt;i9&@ovw}xi`08HaNX$!MR-B6_uY^Y#99y z2(Q?7w6E^5Oa`OySwl_(mUoSrS6TcTj2Cb&nU$=RAYZ{+HR+`DL(dwnk{jJCAKvJY ztx#7K3{R<9(DSn3ezYp%%8%zfj;Kn?GfCeGUR?X@=-yzVLe68sS#r$&USW&Y6mys~ z%=8vgb6m4K_k?Et0mcu9?_Xq-fSo6=>4g6D01>*TeiLR97EF*R$`iaf(cPsayS@1|K@I>A}k7nyC zsZ-yPXu0(T8(N6kKImL829eotgJihyw(cdToNcO zv{Xvpl09akK=^YN_L);$o-TErdL%Rf(A&&0#P#4(j;x5=fMpmNdE)z4*}Q$iB}sDlEl literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/alerts_and_states_warning.png b/res/drawable-hdpi/alerts_and_states_warning.png new file mode 100644 index 0000000000000000000000000000000000000000..1fefdd8bd8a8c674bd81ffb2bca82ae9acb6673b GIT binary patch literal 1618 zcmaJYsQ9`mnfX%L(4Fsk?B;}P# zt5fR~wD_W+wU(;j+mWQ>XjPyp>QsCXTOFqrB~u;IVznCt><{hE+`adHbI$o5_c+p1 z7fs^L-~j+IDLF}#!S1Mc1#sDa7Ux+lyG>`b+00ThpDEMRIG{9=c{rF%=nL=+TyHF2 za~6*WfC;lrnb}OXZi(DL60qKjfo%lEvH>7|fsN7|ig5}1(YSx zp*l*97n+hPXnbi!YNny0*dQ}P3lhM1o17IOa7GW>h!V3!Zc{)bx^njH4I>aZ0%3|3 z(5s@db?Km*q;XIJqp=25ih)uwjEPa1ST+w7q8N%`LIjPA#Zb8DOp+`an__w)$&i*pk^JXpB*2lT<)$~*A{J>-q3W%Aqg>+~YZ>9H-^xYU zVi51s{^zO3Lacwh$8qDbmvQUkX4daCYwS%mU$p`N=Tx#rnQ7}AXhmboz-Rza6~1PJ8slEs#Apm}j^1 zpqAq~y{8J?vZ{BtENR_X!V`HuEh!Za#)}4rd$y&7)%2`_Lj+FVKF(f1uzfFQB~|$g zqKpm|s1~Mn*@ui$WPW+KQ|XC_xIH-Np8AyNOJAM(u-!LNxuyQEn_KHD4eq&y+}goC z^_5!B(E$+^8MH_~=qYb_xv7HN>YCt5yW@Y29|jzD-WT%1I0CotKM8F?_B3});im3t z*zTz6ng5)$TNg_v)Vf4eoh!zE2)=U7IIqtAVj|zU{y@Ny?#aY~N1aZ=+`uOPs86zX zxrgz0C|-R225yA@_PwuLD!#8@KRG8W>?Akgv5>3TrQlNF!TTx0J9q!Ew%=CLT)^3! zn<8rNcuKTqasG^Op>ysD9z;1pr+KOa8vM_=p1^&-=7&Gh1{SUr)bN}6*NcMZ<~GXu z<3MM@$LF;Z8+=8%f|gYm?#kLq_IIB>;dkW5hsStLdzkWvbEJKx=D=&Rwyh7Ux_Zxq zJZtWly3KfK;#A)$^hc}DtDQdZ%SqK;8#_W%VkG-q#MxQB9J4)qAZhdcfXaTTefF(L z+`l)7cYD24y^(WT_P3hXc;@c@H4gvqTK~rAcynvckB>zMKU@AZFQ!g$Y(r6B(DdlY zOFjEm40qgZJg3U*q@};_3_1OcquscUPo&Cty)9o#hoc^Dzw~VL9k^}h%SF9KpC9Uf z?`Y17psvc}D+_g`{PFOvX=h&Gl;szX@@JyoY(ha z7mPha%Mrnjs?_j=;R}}?mDZUjhl;=0>d3%nUA3-Ey76t3kD;ctNv;j@WO=yHV}HwU n^W^zu`z%`IzHgoi(2{R{xf+Eh)OD%bumGAd+p literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/navigation_accept.png b/res/drawable-hdpi/navigation_accept.png new file mode 100644 index 0000000000000000000000000000000000000000..53cf6877eb72ad70368fd9e61fb780d42633a407 GIT binary patch literal 1335 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 diff --git a/res/drawable-ldpi/iconic_x_alt_red.png b/res/drawable-ldpi/iconic_x_alt_red.png deleted file mode 100644 index d560b26460ba89d7cb1cb8465841b7f8d7dd639c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 552 zcmV+@0@wYCP)-%sBNiz zd4`>-U8ptLkGe_b%>=?Fbq8v>iZcsvB#?R%011CmX9BC0n)OOWAm6T++9PgVeN7;) zFvk^h@&Iu8iP~DFGdtG_bNc~6Y1DFN#-7lQJzv@kv|c=561zRL9cBQ4z2OdAjnI;W zU(FrN{yg*^IB?<=Miuo117Y747|TKYYHDP-Tp+Hf?*b6Lc!#kZL~gY;(yL+y{+$gE z#6TR|x)x;5okngC0#IuM5I*r%0IV0oAJuoe}Ua6oYX4z q2lJFc?Wzmky-;*JUiy0e5MTiNRMD9C*ppEJ0000 diff --git a/res/layout/activity_codes_do_not_match.xml b/res/layout/activity_codes_do_not_match.xml deleted file mode 100644 index 4bd1965bc..000000000 --- a/res/layout/activity_codes_do_not_match.xml +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/res/layout/activity_connection.xml b/res/layout/activity_connection.xml deleted file mode 100644 index 367b75fc5..000000000 --- a/res/layout/activity_connection.xml +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/res/layout/activity_connection_failed.xml b/res/layout/activity_connection_failed.xml deleted file mode 100644 index 9672914f4..000000000 --- a/res/layout/activity_connection_failed.xml +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/res/layout/activity_connection_succeeded.xml b/res/layout/activity_connection_succeeded.xml deleted file mode 100644 index 0b6962125..000000000 --- a/res/layout/activity_connection_succeeded.xml +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/res/layout/activity_contact_added.xml b/res/layout/activity_contact_added.xml deleted file mode 100644 index 05a3c684f..000000000 --- a/res/layout/activity_contact_added.xml +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/res/layout/activity_invitation_code.xml b/res/layout/activity_invitation_code.xml deleted file mode 100644 index 193e86aaf..000000000 --- a/res/layout/activity_invitation_code.xml +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/res/layout/activity_network_setup.xml b/res/layout/activity_network_setup.xml deleted file mode 100644 index 48d2de513..000000000 --- a/res/layout/activity_network_setup.xml +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/res/layout/activity_test_bluetooth.xml b/res/layout/activity_test_bluetooth.xml deleted file mode 100644 index eaf4032a4..000000000 --- a/res/layout/activity_test_bluetooth.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - -