From 4849affc6f7804623d649939204c50e999f9cc90 Mon Sep 17 00:00:00 2001 From: masensio Date: Wed, 30 Oct 2013 17:29:22 +0100 Subject: [PATCH] Update image buttons and remove CustomButton class --- res/drawable-hdpi/btn_default_disabled.9.png | Bin 1761 -> 0 bytes .../btn_default_disabled_focused.9.png | Bin 1406 -> 0 bytes res/drawable-hdpi/btn_default_enabled.9.png | Bin 1775 -> 0 bytes res/drawable-hdpi/btn_default_focused.9.png | Bin 1507 -> 0 bytes res/drawable-hdpi/btn_default_pressed.9.png | Bin 1913 -> 0 bytes res/drawable-ldpi/btn_default_disabled.9.png | Bin 691 -> 0 bytes .../btn_default_disabled_focused.9.png | Bin 699 -> 0 bytes res/drawable-ldpi/btn_default_enabled.9.png | Bin 693 -> 0 bytes res/drawable-ldpi/btn_default_focused.9.png | Bin 408 -> 0 bytes res/drawable-ldpi/btn_default_pressed.9.png | Bin 505 -> 0 bytes res/drawable-mdpi/btn_default_disabled.9.png | Bin 1003 -> 0 bytes .../btn_default_disabled_focused.9.png | Bin 916 -> 0 bytes res/drawable-mdpi/btn_default_enabled.9.png | Bin 938 -> 0 bytes res/drawable-mdpi/btn_default_focused.9.png | Bin 504 -> 0 bytes res/drawable-mdpi/btn_default_pressed.9.png | Bin 713 -> 0 bytes res/drawable/btn_default.xml | 34 --------------- res/layout/pincodelock.xml | 2 +- res/values/colors.xml | 5 --- src/com/owncloud/android/Uploader.java | 4 +- .../authentication/AuthenticatorActivity.java | 8 +--- .../extensions/ExtensionsAvailableDialog.java | 6 +-- src/com/owncloud/android/ui/CustomButton.java | 46 --------------------- .../ErrorsWhileCopyingHandlerActivity.java | 7 ++-- .../android/ui/activity/FailedUploadActivity.java | 4 +- .../android/ui/activity/InstantUploadActivity.java | 5 +-- .../android/ui/activity/LogHistoryActivity.java | 4 +- .../android/ui/activity/PinCodeActivity.java | 7 ++-- .../owncloud/android/ui/activity/Preferences.java | 2 - .../android/ui/activity/UploadFilesActivity.java | 10 ++--- .../android/ui/dialog/SslValidatorDialog.java | 6 +-- 30 files changed, 28 insertions(+), 122 deletions(-) delete mode 100644 res/drawable-hdpi/btn_default_disabled.9.png delete mode 100644 res/drawable-hdpi/btn_default_disabled_focused.9.png delete mode 100644 res/drawable-hdpi/btn_default_enabled.9.png delete mode 100644 res/drawable-hdpi/btn_default_focused.9.png delete mode 100644 res/drawable-hdpi/btn_default_pressed.9.png delete mode 100644 res/drawable-ldpi/btn_default_disabled.9.png delete mode 100644 res/drawable-ldpi/btn_default_disabled_focused.9.png delete mode 100644 res/drawable-ldpi/btn_default_enabled.9.png delete mode 100644 res/drawable-ldpi/btn_default_focused.9.png delete mode 100644 res/drawable-ldpi/btn_default_pressed.9.png delete mode 100644 res/drawable-mdpi/btn_default_disabled.9.png delete mode 100644 res/drawable-mdpi/btn_default_disabled_focused.9.png delete mode 100644 res/drawable-mdpi/btn_default_enabled.9.png delete mode 100644 res/drawable-mdpi/btn_default_focused.9.png delete mode 100644 res/drawable-mdpi/btn_default_pressed.9.png delete mode 100644 res/drawable/btn_default.xml delete mode 100644 src/com/owncloud/android/ui/CustomButton.java diff --git a/res/drawable-hdpi/btn_default_disabled.9.png b/res/drawable-hdpi/btn_default_disabled.9.png deleted file mode 100644 index f90d47bcdc7e3c5eff12f2a6204fee735be29254..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1761 zcmV<71|Io|P)H%(|{blE;R1(#JA%5?d_&vdW9&4UG;||?_7t$F_IqyOCC+%J(4tlJ`V_A4S z`MdK#LrPj`k<8FYaClQ|1kg%d^IRLe(_b*~5Dmo?P&tOcnXiM2NrW!s_ zl{xvnG?ii0TNG=!YNt><47|xl+uxmIqYYtxe$leqJRwAm6(IK3L`#dt3_tsFtlu#D zO99mp9}W+Q3Ge(j*>}WBuiqKUg;Axc;Vxi`hLyRf4(6C9k5sZO>j2DT0;HS5;37)b zEUCyYqL`69WK=n5emCOLQcZ(*i9u z$DsBA*n;LShNLru^Q_R_I=yZcEc49aiKK=i)R?4g7OGZ8;F^Q` z0k-m~!I!%XFpWDx$+Jp)wQ)YWmkd>n3ZlvG9BWGI za|LeSXl2Zf-3iUM{%D0#i$-}DnCE)*Mny4k{H&D~olJ$+I7xI*(b!4e(mA9kE|i@a z(=aO1t1Y&dY2j3*b!}`!oKOCXFaM~P{2H(~x}vBuX)e5*-!wSrvGF>?OmW7pGE^$J z7YV4oWkZxr)Fv#>-FHN90A9a*@xyO;q{Ht0dO52n)o{75z^4Gd0q`w=uK|4ez;?X_ z@CSfj0Q@TH%~r!s0GlJ5uqzAmHTt_ZkMaK4 zdo!>}YMTuE5RNN+pvOnUJ{tDe$LS$%GQGt6AeH_l#LV3*Z#M;~N+S z`|e`^r*`IY#0;rZ0Jm56)CGX|w;^{GVn+jvf}MG^ZNuIb2Rw*>ynJu}?Qb8yK7jz{ zAAkr!20bAP1OX`%9tjFK{NsZ!KK<+L?qz59BG$yzlaKy9filA;5fYFDNPt8n*zY7H znbFFxpM3cGWZT)B5Yu(DQz@h4+ml$4a*N}B3P{Te#$L~62{1=(xeV*Asyey1>@6@X zTP5aer(#1kmtikxcrK`}U54ej3C0x{G5=(avj$GPiQXFChgb^ir|LRIl;Y>+N~+r~ zEOsR?(Lsy`+Ab|{XSZR+t((9rR>bVpB01I>W0^Sp8U&HTg^A2r#jFxvuy=;Vm_S;r z(Jof9QAif#3O>&$b8J@1%8!H^(5kNWIC7?txLA$%2frASF4V~2FoH-HkV{S5>uEb= zg}KnEAqd6{R8!+J!dAMp8e*CUe`HO1EM=}rkx1)Dna{{B%lZ&Y6Mb2)oKY0ZcM5LJ z&8&pjG{rSNm}ZE!-y02K4MR*pI2Z!-I%%JiZi>?gjZB8dSa{dug;m2s7c$wS!f7rt zG%m*C*|la8iGk8$JyomY)X0CAsI{7(ITMxV71o2cC###$>2%QLi7 zYcl`buvlvXc^Q+YI$p6xcS0T-&iqXmS30AjF02wHC*!7$4XBmLTQ!R-cdZXt^vldO42) zTDq-zP_yxrR_!Y{F~7p3rx|C)!9bml#eEve{Ms}^#9V4O<4vwylAtY`-(ySjF?v#4 z9;EJ>Pp7nYMaa;A#4$mfqyV)Y*19}4JtrmBaj$~9V3a=-w8KLP4eOFpn}WFpvIL)+ zDOqetG*h7eT(n!JYS*nrgCO7FQgq=#rs|LO1Kp zNbGPUy~bvx12Fa%@#zDI(2;A>A0gDqu{;*0f>CAUjtKPugg+UP`~h4oXB~#|`qEk< z)jS#9RV+O~vSLq5lx%xnt-N)GE6+=CNI2YkbdaAf+au@H7H*{=w=J%cCB)%7j}GEl zkj}RT*|rbg{BZXvfX^{zJ-heg+lNcl#qmJHju#^a0B7I7`#XS#D;xE6|EGTrZe$n$ zoPBra7XV)Z_yoY6g~pr%cm?2i|L5~>uv@#eTf6liUu*r-tkypBUpXqXOz=EE;s5{u M07*qoM6N<$g7lGu^8f$< diff --git a/res/drawable-hdpi/btn_default_enabled.9.png b/res/drawable-hdpi/btn_default_enabled.9.png deleted file mode 100644 index 0af44831ddb2eb03b5d7eb184f69c960148c9a03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1775 zcmV)_Oa0m9he*OAZ*XPu!bDNTI?jU*o zf}MvXo?Z7k!)|hr^hJ-~YwafNE8GL{K7jWCT->t58i2n6`~~2ZR*bkj@xu!MA6{Ku zef{ePUwm~Jp?v)358pn0`t%zBzX5o?)ng9;Jo*0FM?c~Yk1wD6@fm<;l3s50*d>5R zYpEgtHEWs9YQy<*JhHWxhLO}tg}ejcep52S*3e>M+1CO=NCMB)n*dONU3A~p!d8y~ zz=eBE>i6lN*+0Xq7R@L#)6PMHT@H$fNAExO$~{?Bm*=sD;fdDzqlN(@2w{YqVU*{s zT>**V@wnGD$K`n_agSIK%uo+-6YVcMKc$kW4h->ozr^ne?(=}3H{yUS-V9I$9 zvOj6}Dsj+bEgs9lYAt8;I$qjiKbds%Kw{tWG$&- za;H7Scq)#{Jd$HMxnsc+%gC2;?Wm9*`WgI2>T$ne9uW;3f)?vkbW@E~_RwVGzT|I~ zHy$=lT^MV)Zcm~G>N5&SxDB{SVUnXPM^Uu2Fd;Mrcz}^#))|tmRwg?`*$iB%$QjaL zg!cSVjp|kB6>Ks0ZV|wv(#rOSGSJ;yi+$!4sW#^k9YR*hbOVx|^%x{H161#Q5>wGB zA%6yAqD5QErZLs~>qu!!e!&N(l;$h%TKHC2792;#2^Ye?A-R21)a;yNc zwe--HOhXQb@HsRQIT>j39? z9b%Zs$UPQD8x%YceyUVu1*k2qxM>rQR1OZ`r=E1)ETxZkS&GWM#|y(}=R;GHXiuq1 z(t_%z$(r+QiJ(JDI;`s4b&y(5%x6$mg0$Y3Dx!~aiTi8xOl;hmx&~k^ctmQ3LrNqy z6rsi>ZL?6dG6L5e+z+soPYu4@Wq@hi5lWs_;;W7G(T!xNYE&paMb6CKo~2mU1!Nsd z{#8kEZD(et+N&C{rmdXaa=O-K^1MLP^82RR9<(ye@BogL{Bo}~4oaO3(yXME9j4UM zlpFX?;jR?{AjwISGPug&hu1WzM4ENfUA+=@^3EmLdmsbwR7K4+kf;uvz8`Ri^Lr0W z`$IkmLoU=YrXeILMM-IN<~oVS2lTNredo$d!d=3<%E^*h9AOLv`_NvJwH+6V%T`Sq zM(Pe*niKM{5<(yksn$eMYpS-|5(;a9Qng~I)a-NT`5fc*+ky^H!49-w8HnvZ+ko($ zk+cmRBr?b%4&qo-QlBeu`$j8ccI-}Qw)ICVlv*^(yTClvqcZ%*GQAV+r;>i5qj_W}W+Pm(0*iyxy zs1t!{+?cQ>!^No}OffF%-mrvih=5_};&e_n%m5c15p`;!W>=tYAB-P%$=&n(pXdMk z{ok+7Qtr)W4C+8Wms>;wKvuTTO;Q!K0G7~Y46Bh$eSJm( zGIovR%}g_5cI#;elk4Z{LVtmc@>ftQyCi!RnB`N81TI=2L7&UXdelCRWQJEQ?t{m$ z1e{S3Dm0Q=r;5!MP|xu+mB2?CpE-C&>o6s z+ycX~V33h4;VK1|4p&Kc?ei-Qw5kAriA`oc`mOi~ORl!N7&jh3K! zW&>?E@|+8t$*-DuhJB+EGvEdU&&-^QTc=Yh6)K%Up_3yjTq&8u+W$|^V9^;k*c|_9 zme7&dfx+$5))$4R!$Y&;#PH&1>`i$R4FKVbOoZ0vyK?ib;|0CQf_n$sZAlB9xx@2% zEOqgdfxzGdG9A{iDZI63Fc63a!*nI4%a;126>VwbQ020mcj|Z;b zy0DphyfZcR(kVFc-Ll$6kNmYsBcl`4P^GYGUrzPa?3k8A_eL(3*KOwFqqCHKtzKzu zb~*;=rSz@+{OyVRgDrnf?maM&wC3_+)lmNTXp?2#;nAPnOj=uHO~=iKh8wHfNK_Gd z=UeJ}^Mm$n1}tjp=oe^-|LWwDgbi(J`OA{2=&1U-(NF%~ej>SkVEYSezngL{kr(#w zj{D|9u_LjON$j@v$K*p7p!D-lR(0ARH=+upODzvaJ4P-)Y_{7zI@a+SFYW1RxLtpS zDXb`awbLMN9NTwy?7habQAbzmixduYti0%}m7Bfo!kvS8ZRh5F$Tf^{E1JkF*W;VI zy9-X09Vg=>%hM@mVvB;>)<1CM#cJoZBaif(hM2C!zib~@{xt2uJ~;5#xV<*jjlGn* z>(i2#J5Sc*DWCt=w`E#}{<_9`*gV`ieC%vO?`bJ=E^W&?{raN7{vTFp1J{Pv|Jb+l z_Y=~t+#B4<`-fQB!s_<$=A}D27b1!2KwKca>mWPrir|`tP8HpJqb3YUkv=%Tv9I%D P@V9F+6c9&sZ*Tnv0u?Jn diff --git a/res/drawable-hdpi/btn_default_pressed.9.png b/res/drawable-hdpi/btn_default_pressed.9.png deleted file mode 100644 index 4312c27f4d6d134c9cc95ca95c3ab95b547b4c67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1913 zcmbVNX;2eq7*2(v1yQQ0B|vo>k1Ck#5!f6<#2iEt4TcaE5eCC%fk?6&lMMu`R#9rH zCyo>kMq6tY5UEtLo(LXsJg}Xj7#Ts-ilYr8cvK8%Hwv~t9Dj6YcE9iazV~_Fd$v#$ zKP}Kd#Gk=n1S;d?T6zp5dA^!Hl8g!S~oqGFS%L^6ZQ)mw3f#6YIwfYPkb#I?BI zkhkzW9?f9*WEgcxRFZmz2qVp0y;q0pFk5IegApC$u;{UDoC4DEOd}y?cOE;*28;$V zdrp)ZQd?wrmN9OT6;E6gufrB)V?qNvW(pAP5YYr?oYDghvx%^Y9AfrsUJYdzvCZq%{+Sg+ig113@^n2FI31Pb70yA`ABkui1vOy}zVBV81|Nls#RGfq%SxtLAga1BO-NWteT zV3;2X@ev3Wz_5T9DUrg`NQfsCNZ?5M0LQzqC?bf3At5SJph6gyD~1h0JR=75?JV?kFu=}xw|C2M2 zb_Vn|$A6k-;E3)(@Ahr$)56=~!3la|tn_G5{uzz*#FZ=M5}l*jojjc!2?sqhD9_Bh;4oPcBSbAk~5=Z`+=*K0ymMqoU>Lu zQMcECbdH+&H6opRW{~XA8Hoqel-50B-3AL_qwgzMaP~cWZXOeYA|rNuq$k5%=9 zE0f0#su#|lT}7nKJe+{$Jdz-`;b^%WyKpK&f@~b$lA2dsy=+WkK5xy|BcXq7-D$4O z!oF`pO4imlr!wqwMmdKqYjlQBmmUlc#eCgIC$BuWLFP;w=PC}lA}ofB8Nr$rj@HJ& z(u%O>qua2`cmtMPJdNpet6Z$Hd$otk*QYp9IEWHS0^G>yrFuwd;OM+cKtluhz#S z!!I2UnE$l*Leu_FnS&!nmi=;or;Q7_VaO?3wff^6=eVevhx2@o-wl19j*ngw()*J@ z)3^EhcokBieVL|L49fQW)I5|Ky5GKX(!{!9N8R~(a~_13UKx`;qsLjL>PR`aO?5c> z_t6_YS-m)W)<&Moxl8P>*rbcu{Q_lrs!U~dfF!4S#F=(WMSgA^UTLbYS&rU02nRmc zaGP7PF1@x}opSMc1KNJGc)k)S*fqIm#b?9?kBnvdw%a^)*4@0D$L6;bw~jVVOfZco z(!A zq)kP=a-uiQr5|#ZEC~QH4}?_jxiiYefgToh?((z6>&}MNu4TRQ4Q5ak%cC+(u*~~2 NRK~{3tEBVu{{aLk_WJ+; diff --git a/res/drawable-ldpi/btn_default_disabled.9.png b/res/drawable-ldpi/btn_default_disabled.9.png deleted file mode 100644 index d549e5a638685b854d0cd7134ecc3f79a06548dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 691 zcmV;k0!;mhP)lFY10x(HLK~zY`?N%|4)IbodGJ8i(ctRvZBqsu1v@tK>0la{KXg@=W zghWC_dLn@g5#a73nD)56GrQx<8ELe(cU-RSs_q%09m4*>(Sv6I?j8a70N~dp!0B{4 zeZZS{uXe+Ie*f)wJiZ0s6(s$AINX1H{s?x6^-nj?B4-3}W3%9gexiDbwOIgg3*b)% zti!#``ZiaUC_n+t_>bOUy#*x92v*Wc(y#YgKH`nYIs+8k6wCyOh1vpt#@t=k8JY{` z0IT?!p&F0b2+$353lc04RAHRiaUpN5v6~!vlb6JnC`c-7+qDg#ipp6Ob!s3kxi5z+ z2tg>+SjZKPxK9)r%S@_@1vnF@%7q)pqL`hRNU#u7DvHymp(p~};%A0)Vgc_& z+?JkszmPX|6A69dI{@8lL?y~A?bkpF2aY~qmC9$qAdtLrato6K za9y{}-yfe|+`PPh{oB3UxHe;&CVl_<^A`9rUp&sm+3@Z>6&J=F=fj5!(f=Q9z3e*7 Z{{!BNT);@t5Yzww002ovPDHLkV1fa*F=GG# diff --git a/res/drawable-ldpi/btn_default_disabled_focused.9.png b/res/drawable-ldpi/btn_default_disabled_focused.9.png deleted file mode 100644 index 3fd67eb986ef431a478a531394384a082e5442e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 699 zcmV;s0!00ZP)IXZ)@B zW2fcGd6|!V+Z-AZ`H!_XuGUSjEbQduY0? z=|ac=mH-lp>;gwtK9b|!r(&Jk(pDj-eKP>$5F89c$qkF-FvYxD06T_4u4s-W;G8zK zGmOOtauGt54=G7#$?KS3E7b8L3wI)~)FEanq$2wk4U@HU#{+8>U0WpgvbIq}P)MiT zP*NIbmvx5j<+<`|F60hW#n8RQ6z@7k5y?#8;1#I6Tiaxchf2drJ+s`F-dKluS4EeL zPF7D%Wz=>J-Q)P0q=Gi@v@C<8O+%HZ0)#}$rBvmKZV|cFWjXHkzrnicYM{`{P+p|; zkop!|n>LanV>M~m9XYsF{w9~PtU&hZ)ZhU>_)(c9OjqsynjU0`Pb=oj$v>eKHJ h_#gi)G;)bA@f*LSoI)UTed7QC002ovPDHLkV1g+~Hyi)} diff --git a/res/drawable-ldpi/btn_default_enabled.9.png b/res/drawable-ldpi/btn_default_enabled.9.png deleted file mode 100644 index 04b12c64a85f25e3c446ad3b7e1c3e9e36f2ff11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 693 zcmV;m0!safP);z80y0TNK~zY`?N+g_)G!d72?z9)ub`oSqCor#{dGuu0Uy8@AVGCM zLxT_!5{^4~N^2ukOJPvHtPqS>%iW9@;GWp`WN;Vr>=yJOc11 z1J>bQW__EhN)(`gX8cF*u-*a^W&|r~CF$3DEg$hlWSs#DZVF}s#6oR>KV$B$>kQ2W zbAVO+%ur2@*$B`LbPEzJ5L98D*>NFnZDBV#^d>KfEm4qE*tTmMKoymTO?SBDHWyCr=chU+~T#W1?#;O1;qm1 ziMX|%dEdwz-$X(m_zpn#8c~VzO8fN@pqazCvdMm72iMF8DtnoAnFy9P181^$gsmaN zC5P&FLuL!2lkcvVnSi7%Cbu8)Vc8f^Yn5v|Efymb;gf=*#D*%%*H*YRGOz5oA?)L_ z(V7>fD3z*^>;2fvPWa5#a?EX&snM#gAFG@yZ@Y`cldzzm9V&ZgBikA~Nlm!#P}v2D zT=u3Cwqh&DUm<%cv*|WvlLEZ5Ss8H~{Elv;G8thiHwh`MQh(s+1J*qFEEoimS59tG z)-uXcP-00000NkvXXu0mjf0gNsv diff --git a/res/drawable-ldpi/btn_default_focused.9.png b/res/drawable-ldpi/btn_default_focused.9.png deleted file mode 100644 index a09da0072d9757b5237ce48c26364015490e8057..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 408 zcmV;J0cZY+P)4mOW0xKoCaXu7O|)2`N@83Pi;bI1)$T3><+YaRdqq z3aZFODiZAEqp$#b*FR&7DfkLo8qYkotM&cmW4hmE7TQ~~$X9nSH^6fjaGCD6S-H+l>7}bI1D1Wj1SfFDC9M3Cx+w%Y zB+NaLs+gL59BplItFL@uh~~$jMod`p1a74`Lyai8V-1_Y@fre-Zb~nZAC%lsJcsp{ zO@CYR=LmIUIpf3~b48 z#Mqb)hl!ef>xJJ36#M$XI(2N^>~q-W)59A+v5Ug1JU%;g{9XfRuM#NgwlI}z;1)35 zzJMHf0G_&lC%`$dFameL26#96|4YfX)l8R0Nqhh@$ZB@rSj?0F0000CmOD9UT%KSK$C0ibHS}I!Y)h zs3;IYtg`D2g&nP9=P}uqk)kM*@#lX$@i?NYhzN;k>gci7Kvg9r32+G<11|WA=v^~W z9iBJ92e4}Z^8|QZKHWaAir=+G-cNn>b#ni52fXzG*Q=sj^Zjn&u{yn41Lv_X1uhW> zg~MdxAX�s7MV`8-X?K*O=xZuBh4zOfxhFYO1gRC9C}~u%#dcO6z8`S)wSNbVABL zb{o6$qM+CnD!^h0=oRN%amZR(rofp`!wA&zqBtLsFKw5JL1E$NvntG8dCJp^G6)Ps zv8CK)`G=kDrUBDPL=VvUD67JJ!LyWA#av}nMuBpG!oi)=(UHb@`}3p==zEvB%Cg7y z0E7HVDYqDzLRI_LLml`dwHG*_rqE@!7Ng#=ZLpbi(GA12s>Th@l zaQFK9`uXXjH?QVP(k#q=p9TQ9`TX+r)z#HI0KX17dieI!)Av*Qc@6-}S)HfGf1lXp z?-!3hJOl70uDP{v-^G-EoC^{`tV^$QbONUI{S3gxk|WI`J2T4{1htUbBK0>Y=0+{L zv-wt*B7(_{g5^tuF1Bxk~!hzP+zmfDnrwX#Va+EfdP!5UdL zq*4#CD}lN)sI3Xk*3}4xE(##mOv08n)P#BRv^pY~`L5McpPe-n6JSALEs>-hVzY-w zQFT>FTT!Mtm&CS?8mZCbM67ngY0$TjTE%3J@(6)X!3)cOYIzON9*W5Fjifwn#jtZI z;7(OO+SPRtsi>oYg)_-joN9Pf!wCyeIK-or30n(J&pdJpRj+oE&Tzg`8Dv109LDCR zz7&dV8bcjSRogQ*>6;wZ`37*6$uq?r`aHx+HHMBNOn?EA31EICTWC^f>P zK%wG<%(d&BT1a78V?!O*Vn1~tFo2>-P&hZQ5m&Ye$FA3(K5@$BD3e$@l1X41A?y@% zO|d29kec!oqQ;R-hC%g~bBV3fs3TQ3q_ns>+K=ijfuLk*6%0*J-RPB$|kb@8{F zM)m5U>NKMv4JboUI0o)CBx=Sl?H!+YppJm$DX5z_3RzUXDdpddv<;=}8z03CiaIz3 z>Fn%q@3YLIDTtV0fvhZpi1#bj{%&yT7@X@G>iS~Go?4t5`zHwqX#n0Sj$7>Mig{Ne z5M~FIJggpx)s$G^R{CSDx_;EHUW2+a%(t{Lvc<>a2x7ME&d?KuejcbK{qH-Nl;SCP`fwax8xZ&Ru}{JE1Z z4Zvp23ylW=o&dNH;AHRx$pqjVfR6ya9&(fbobFVO!^Z}|4R((Y|Brw5IO3(9Mqe6A Z!XKWuKG7syXIKCL002ovPDHLkV1js)#A*Nl diff --git a/res/drawable-mdpi/btn_default_disabled_focused.9.png b/res/drawable-mdpi/btn_default_disabled_focused.9.png deleted file mode 100644 index 552d2a1858138d61d29c7d947eb223a4b54d4367..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 916 zcmV;F18e+=P)41pWK^Mj4`;j9VM z#$&+t78clDT|2CyTZ1EsB}-pE4wirH4S-v~GvHBML#F}0k5;NTtDm{U#&(c35kql7}V&aAa z6nZDG*K{%DfLy?!-p7=)Dsw1>xz9}TGJzsEGA~zh*-0E?#jAM0I%t7xwDH#WsSx`-ZPKnCAqEW zze96bqv}Nl%dU^OEFPjH)0xR+Kx9dCSZ?Hz)hR z;^m#KQ+F?1z0|}qd1qVv_00-HoAbnI8@RIad)HRBcaOaYjP*XR=DC&M2R;G&EpO!x q>;O+jPk+ATWSoqDcC@%iPL4l#4=#QO%p#@$0000*a1nC&WVf&1+}zxJ0PypaqpSC~`_Fgy_H@ggKgPAa+JC$T@YV01b(W^RKeFpL-e2Xg0FzS#8~O_r$`1qnf*2xIWV#sNf#Lj1bB zdXA`LFfIbLbmz%?_%6dT1Ske*zHVj^S-I`R0TNI$8l5m1*GcB7k4VTCls5r^fC-Go z4UC~o@HC1j<^?HK=`}c}YVN4Zk`*~J^9F(&1Hfodle+VtxgL=sqAK_VLb_C`fe%}b-e9I=qJWD63*o?P9Dfz&x{BUKmUY)a{75d^24xh^9jF7Rm?ygcl>C#~aA zHBTqgWEe=$L!3r3jVVLOHuIfk?&NY-!!Ip9=*+hXX{!9ui(1nL-5e&IX z(`Yq_u+{)|uGi)$GsM*1jvq&v#b)%=%{F8N#|?55Bo084 zhBQ>vTmp$Eq9IX|jfWyBB4?anJ8>Fb6KS0F^P4vwuUAwR5y603!40q{(v+zZ;jch| z&ddGf!`X4W6Fr&WUO&E{y1hXkaLZ$D@4pprecNdsr(d73JV>j>Gz0M>|kt!zRk8x?+kn;8B1mr|Rs5ZeLL#?OXRK)ESC-6lg&i zd~u3$$~&eQvOIETINX9#GZ%Q$_DIs1lo*fl%G(U@V#AiHx)4l{<_CG2Fc+mLM^Ld1 zTke>Mdfi&^CGnKvb!HJ$HtzePo9NsZ-L0xtI-`p1pOq3F97{b;4S! zl)ZNE%-e(=FV?+%MG6e3l{WQ>v(#?HxM75md!M}x+yHmLc>>QAcn6+=(K;dl4uR9f uZ!8+%2N(irA1nT`KO}s#i~g*ls{8^xJfAw%!r~wR0000y#Yv^2TrgF=O9~& zm;@0KA#n&&Hbvs0o$YoNf!(u=+dJ;I69P)pvZu!G-{q?MT^=zrM1+i3PFaxri>&5V zm6EPNfX5%+JbQir?#ZKmBZC@Fz|_pC;yQ=-O6MG^ia3Wk5j8VGgpXgoy*t0Se4hes zlJ8sK?B&z(m3{xZe%Y>PJbTieUtE3yejEb=xQ7jh^Xq}|>;}IDy7ZS6NPtsBL9_x0 zhEaRqx&#DZEkK=91^N<@pRkaokep3+iPD0u9z<0gb03*Y6aq*C4&1WJbn7;NM-1|8 zQIu%WOj4y~bSuSj@0}?W=xE_4H35F5>Rfn7soOd;%T7#z4A9Wj0mZF51+I<(-RNp@ zZrS$~$N`%$wkhg{5)kb3pwgt^qZxmtKspVwwqPi-w*y?TsX7?4`<^={x|XOjH3y6( zAY(GSl7eiZk6gC93Msm{00evXuCypL#bAI|W-yi9uB9MhgsEs-^b1bNW0HlRf1yvR%tb|XkkH$sJ5Ek`!vr?9xuny>L-(4?p-%m*D zhFl(j)gKcv>WW*}u{WhM>H>SuCg&`QJXLv=hfFWBcgQ1a%A-XmtYo_@M2^(nayYIn zyakQ5;h{QrKN6^qIei>*a4 v$8=K+&ribjf99wE@{dc!pLVf;S%>ilkc8}6XwnO$00000NkvXXu0mjfK(Roa diff --git a/res/drawable/btn_default.xml b/res/drawable/btn_default.xml deleted file mode 100644 index ebf44cac..00000000 --- a/res/drawable/btn_default.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/res/layout/pincodelock.xml b/res/layout/pincodelock.xml index bb13c5f7..48925beb 100644 --- a/res/layout/pincodelock.xml +++ b/res/layout/pincodelock.xml @@ -18,7 +18,7 @@ along with this program. If not, see . --> #DDDDDD #00ddff - #84bc34 - #a0d92d - #83b324 - #e3e3e3 - \ No newline at end of file diff --git a/src/com/owncloud/android/Uploader.java b/src/com/owncloud/android/Uploader.java index ddd3f4ca..8e69516e 100644 --- a/src/com/owncloud/android/Uploader.java +++ b/src/com/owncloud/android/Uploader.java @@ -32,7 +32,6 @@ import com.owncloud.android.datamodel.DataStorageManager; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileUploader; -import com.owncloud.android.ui.CustomButton; import android.accounts.Account; import android.accounts.AccountManager; @@ -57,6 +56,7 @@ import android.view.View; import android.view.Window; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; +import android.widget.Button; import android.widget.EditText; import android.widget.SimpleAdapter; import android.widget.Toast; @@ -311,7 +311,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro new String[] {"dirname"}, new int[] {R.id.textView1}); setListAdapter(sa); - CustomButton btn = (CustomButton) findViewById(R.id.uploader_choose_folder); + Button btn = (Button) findViewById(R.id.uploader_choose_folder); btn.setOnClickListener(this); getListView().setOnItemClickListener(this); } diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java index 69872d73..f6e67802 100644 --- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -63,7 +63,6 @@ import com.owncloud.android.operations.OwnCloudServerCheckOperation; import com.owncloud.android.operations.RemoteOperation; import com.owncloud.android.operations.RemoteOperationResult; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; -import com.owncloud.android.ui.CustomButton; import com.owncloud.android.ui.dialog.SamlWebViewDialog; import com.owncloud.android.ui.dialog.SslValidatorDialog; import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener; @@ -188,7 +187,7 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList mOAuthAuthEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_1); mOAuthTokenEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_2); mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check); - mOkButton = (CustomButton) findViewById(R.id.buttonOK); + mOkButton = findViewById(R.id.buttonOK); mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); /// set Host Url Input Enabled @@ -200,11 +199,6 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList if (b != null) { b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name))); } - -// /// complete background of 'OK' button -// boolean customButtons = getResources().getBoolean(R.bool.custom_buttons); -// if (customButtons) -// mOkButton.setBackgroundResource(R.drawable.btn_default); /// initialization mAccountMgr = AccountManager.get(this); diff --git a/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java b/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java index efd4e01f..11e73c24 100644 --- a/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java +++ b/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java @@ -20,7 +20,6 @@ package com.owncloud.android.extensions; import com.owncloud.android.Log_OC; import com.owncloud.android.R; -import com.owncloud.android.ui.CustomButton; import android.content.Intent; import android.os.Bundle; @@ -29,6 +28,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.View.OnClickListener; +import android.widget.Button; public class ExtensionsAvailableDialog extends DialogFragment implements OnClickListener { @@ -41,8 +41,8 @@ public class ExtensionsAvailableDialog extends DialogFragment implements Bundle savedInstanceState) { View view = inflater.inflate(R.layout.extensions_available_dialog, container); - CustomButton btnYes = (CustomButton) view.findViewById(R.id.buttonYes); - CustomButton btnNo = (CustomButton) view.findViewById(R.id.buttonNo); + Button btnYes = (Button) view.findViewById(R.id.buttonYes); + Button btnNo = (Button) view.findViewById(R.id.buttonNo); btnYes.setOnClickListener(this); btnNo.setOnClickListener(this); diff --git a/src/com/owncloud/android/ui/CustomButton.java b/src/com/owncloud/android/ui/CustomButton.java deleted file mode 100644 index ab4db65d..00000000 --- a/src/com/owncloud/android/ui/CustomButton.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.owncloud.android.ui; - -import com.owncloud.android.R; - -import android.content.Context; -import android.util.AttributeSet; -import android.widget.Button; -/** - * @author masensio - * - * Button for customizing the button background - */ - -public class CustomButton extends Button { - - public CustomButton(Context context) { - super(context); - - boolean customButtons = getResources().getBoolean(R.bool.custom_buttons); - if (customButtons) - { - this.setBackgroundResource(R.drawable.btn_default); - } - } - - public CustomButton(Context context, AttributeSet attrs) { - super(context, attrs); - - boolean customButtons = getResources().getBoolean(R.bool.custom_buttons); - if (customButtons) - { - this.setBackgroundResource(R.drawable.btn_default); - } - } - - public CustomButton(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - - boolean customButtons = getResources().getBoolean(R.bool.custom_buttons); - if (customButtons) - { - this.setBackgroundResource(R.drawable.btn_default); - } - } - -} diff --git a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java b/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java index fc9afcde..056ffd6c 100644 --- a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java +++ b/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java @@ -33,6 +33,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.ArrayAdapter; +import android.widget.Button; import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; @@ -42,7 +43,7 @@ import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.ui.CustomButton; + import com.owncloud.android.ui.dialog.IndeterminateProgressDialog; import com.owncloud.android.utils.FileStorageUtils; @@ -117,8 +118,8 @@ public class ErrorsWhileCopyingHandlerActivity extends SherlockFragmentActivity } /// customize buttons - CustomButton cancelBtn = (CustomButton) findViewById(R.id.cancel); - CustomButton okBtn = (CustomButton) findViewById(R.id.ok); + Button cancelBtn = (Button) findViewById(R.id.cancel); + Button okBtn = (Button) findViewById(R.id.ok); okBtn.setText(R.string.foreign_files_move); cancelBtn.setOnClickListener(this); diff --git a/src/com/owncloud/android/ui/activity/FailedUploadActivity.java b/src/com/owncloud/android/ui/activity/FailedUploadActivity.java index 76f2ba41..33432cfb 100644 --- a/src/com/owncloud/android/ui/activity/FailedUploadActivity.java +++ b/src/com/owncloud/android/ui/activity/FailedUploadActivity.java @@ -18,12 +18,12 @@ package com.owncloud.android.ui.activity; import com.owncloud.android.R; -import com.owncloud.android.ui.CustomButton; import android.app.Activity; import android.os.Bundle; import android.view.View; import android.view.View.OnClickListener; +import android.widget.Button; import android.widget.TextView; @@ -45,7 +45,7 @@ public class FailedUploadActivity extends Activity { String message = getIntent().getStringExtra(MESSAGE); TextView textView = (TextView) findViewById(R.id.faild_upload_message); textView.setText(message); - CustomButton closeBtn = (CustomButton) findViewById(R.id.failed_uploadactivity_close_button); + Button closeBtn = (Button) findViewById(R.id.failed_uploadactivity_close_button); closeBtn.setOnClickListener(new OnClickListener() { @Override diff --git a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java index ce7ef798..a851dd18 100644 --- a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java +++ b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java @@ -25,7 +25,6 @@ import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.db.DbHandler; import com.owncloud.android.files.InstantUploadBroadcastReceiver; import com.owncloud.android.files.services.FileUploader; -import com.owncloud.android.ui.CustomButton; import com.owncloud.android.utils.FileStorageUtils; import android.accounts.Account; @@ -78,9 +77,9 @@ public class InstantUploadActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.failed_upload_files); - CustomButton deleteAllBtn = (CustomButton) findViewById(R.id.failed_upload_delete_all_btn); + Button deleteAllBtn = (Button) findViewById(R.id.failed_upload_delete_all_btn); deleteAllBtn.setOnClickListener(getDeleteListner()); - CustomButton retryAllBtn = (CustomButton) findViewById(R.id.failed_upload_retry_all_btn); + Button retryAllBtn = (Button) findViewById(R.id.failed_upload_retry_all_btn); retryAllBtn.setOnClickListener(getRetryListner()); this.failed_upload_all_cb = (CheckBox) findViewById(R.id.failed_upload_headline_cb); failed_upload_all_cb.setOnCheckedChangeListener(getCheckAllListener()); diff --git a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java index 0aa84753..e879cc7e 100644 --- a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java +++ b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java @@ -26,13 +26,13 @@ import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; import android.view.View; import android.view.View.OnClickListener; +import android.widget.Button; import android.widget.ListView; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.SherlockPreferenceActivity; import com.actionbarsherlock.view.MenuItem; import com.owncloud.android.R; -import com.owncloud.android.ui.CustomButton; import com.owncloud.android.ui.adapter.LogListAdapter; import com.owncloud.android.utils.FileStorageUtils; @@ -52,7 +52,7 @@ public class LogHistoryActivity extends SherlockPreferenceActivity implements On ActionBar actionBar = getSherlock().getActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); ListView listView = (ListView) findViewById(android.R.id.list); - CustomButton deleteHistoryButton = (CustomButton) findViewById(R.id.deleteLogHistoryButton); + Button deleteHistoryButton = (Button) findViewById(R.id.deleteLogHistoryButton); deleteHistoryButton.setOnClickListener(new OnClickListener() { diff --git a/src/com/owncloud/android/ui/activity/PinCodeActivity.java b/src/com/owncloud/android/ui/activity/PinCodeActivity.java index 068461a8..c962fb2f 100644 --- a/src/com/owncloud/android/ui/activity/PinCodeActivity.java +++ b/src/com/owncloud/android/ui/activity/PinCodeActivity.java @@ -20,8 +20,6 @@ import java.util.Arrays; import com.actionbarsherlock.app.SherlockFragmentActivity; import com.owncloud.android.R; -import com.owncloud.android.ui.CustomButton; - import android.app.AlertDialog; import android.content.DialogInterface; @@ -36,6 +34,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.View.OnFocusChangeListener; import android.view.View.OnKeyListener; +import android.widget.Button; import android.widget.EditText; import android.widget.TextView; @@ -45,7 +44,7 @@ public class PinCodeActivity extends SherlockFragmentActivity { public final static String EXTRA_ACTIVITY = "com.owncloud.android.ui.activity.PinCodeActivity.ACTIVITY"; public final static String EXTRA_NEW_STATE = "com.owncloud.android.ui.activity.PinCodeActivity.NEW_STATE"; - CustomButton bCancel; + Button bCancel; TextView mPinHdr; TextView mPinHdrExplanation; EditText mText1; @@ -71,7 +70,7 @@ public class PinCodeActivity extends SherlockFragmentActivity { Intent intent = getIntent(); activity = intent.getStringExtra(EXTRA_ACTIVITY); - bCancel = (CustomButton) findViewById(R.id.cancel); + bCancel = (Button) findViewById(R.id.cancel); mPinHdr = (TextView) findViewById(R.id.pinHdr); mPinHdrExplanation = (TextView) findViewById(R.id.pinHdrExpl); mText1 = (EditText) findViewById(R.id.txt1); diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java index 44e44221..7196b138 100644 --- a/src/com/owncloud/android/ui/activity/Preferences.java +++ b/src/com/owncloud/android/ui/activity/Preferences.java @@ -19,7 +19,6 @@ package com.owncloud.android.ui.activity; import java.util.Vector; -import android.accounts.Account; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageInfo; @@ -41,7 +40,6 @@ import com.actionbarsherlock.view.MenuItem; import com.owncloud.android.Log_OC; import com.owncloud.android.OwnCloudSession; import com.owncloud.android.R; -import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.db.DbHandler; diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java index ab7bb463..cc1f7de1 100644 --- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java +++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java @@ -29,6 +29,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.ArrayAdapter; +import android.widget.Button; import android.widget.TextView; import com.actionbarsherlock.app.ActionBar; @@ -36,7 +37,6 @@ import com.actionbarsherlock.app.ActionBar.OnNavigationListener; import com.actionbarsherlock.view.MenuItem; import com.owncloud.android.Log_OC; import com.owncloud.android.R; -import com.owncloud.android.ui.CustomButton; import com.owncloud.android.ui.dialog.IndeterminateProgressDialog; import com.owncloud.android.ui.fragment.ConfirmationDialogFragment; import com.owncloud.android.ui.fragment.LocalFileListFragment; @@ -58,8 +58,8 @@ public class UploadFilesActivity extends FileActivity implements private ArrayAdapter mDirectories; private File mCurrentDir = null; private LocalFileListFragment mFileListFragment; - private CustomButton mCancelBtn; - private CustomButton mUploadBtn; + private Button mCancelBtn; + private Button mUploadBtn; private Account mAccountOnCreation; private DialogFragment mCurrentDialog; @@ -103,9 +103,9 @@ public class UploadFilesActivity extends FileActivity implements // Set input controllers - mCancelBtn = (CustomButton) findViewById(R.id.upload_files_btn_cancel); + mCancelBtn = (Button) findViewById(R.id.upload_files_btn_cancel); mCancelBtn.setOnClickListener(this); - mUploadBtn = (CustomButton) findViewById(R.id.upload_files_btn_upload); + mUploadBtn = (Button) findViewById(R.id.upload_files_btn_upload); mUploadBtn.setOnClickListener(this); diff --git a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java index 82ecd6bc..1ccc8fa8 100644 --- a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java +++ b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java @@ -34,13 +34,13 @@ import com.owncloud.android.R; import com.owncloud.android.network.CertificateCombinedException; import com.owncloud.android.network.OwnCloudClientUtils; import com.owncloud.android.operations.RemoteOperationResult; -import com.owncloud.android.ui.CustomButton; import android.app.Dialog; import android.content.Context; import android.os.Bundle; import android.view.View; import android.view.Window; +import android.widget.Button; import android.widget.TextView; @@ -143,11 +143,11 @@ public class SslValidatorDialog extends Dialog { View detailsScroll = findViewById(R.id.details_scroll); if (detailsScroll.getVisibility() == View.VISIBLE) { detailsScroll.setVisibility(View.GONE); - ((CustomButton)v).setText(R.string.ssl_validator_btn_details_see); + ((Button) v).setText(R.string.ssl_validator_btn_details_see); } else { detailsScroll.setVisibility(View.VISIBLE); - ((CustomButton)v).setText(R.string.ssl_validator_btn_details_hide); + ((Button) v).setText(R.string.ssl_validator_btn_details_hide); } } }); -- 2.11.0