From 49b3acd2be5140725d48ec3988017182b07f9376 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Sun, 26 Jul 2015 17:52:29 +0200 Subject: [PATCH] added indeterminate progress bar to show activity since this isn't supported by AppCompat anymore --- .../backup/owncloud_progress_bg_light.9.png | Bin 0 -> 1084 bytes .../backup/owncloud_progress_primary_light.9.png | Bin 0 -> 845 bytes .../backup/owncloud_progress_secondary_light.9.png | Bin 0 -> 147 bytes .../owncloud_progress_bg_light.9.png | Bin 0 -> 1084 bytes .../owncloud_progress_primary_light.9.png | Bin 0 -> 845 bytes .../owncloud_progress_secondary_light.9.png | Bin 0 -> 147 bytes .../owncloud_progressbar_indeterminate_1.png | Bin 0 -> 462 bytes .../owncloud_progressbar_indeterminate_2.png | Bin 0 -> 574 bytes .../owncloud_progressbar_indeterminate_3.png | Bin 0 -> 673 bytes .../owncloud_progressbar_indeterminate_4.png | Bin 0 -> 688 bytes .../owncloud_progressbar_indeterminate_5.png | Bin 0 -> 682 bytes .../owncloud_progressbar_indeterminate_6.png | Bin 0 -> 683 bytes .../owncloud_progressbar_indeterminate_7.png | Bin 0 -> 645 bytes .../owncloud_progressbar_indeterminate_8.png | Bin 0 -> 631 bytes res/layout/files.xml | 58 ++++++++++++++------- res/values/colors.xml | 1 + res/values/styles.xml | 6 +++ .../android/ui/activity/FileDisplayActivity.java | 25 +++++---- 18 files changed, 61 insertions(+), 29 deletions(-) create mode 100644 res/drawable-xxhdpi/backup/owncloud_progress_bg_light.9.png create mode 100644 res/drawable-xxhdpi/backup/owncloud_progress_primary_light.9.png create mode 100644 res/drawable-xxhdpi/backup/owncloud_progress_secondary_light.9.png create mode 100644 res/drawable-xxhdpi/owncloud_progress_bg_light.9.png create mode 100644 res/drawable-xxhdpi/owncloud_progress_primary_light.9.png create mode 100644 res/drawable-xxhdpi/owncloud_progress_secondary_light.9.png create mode 100644 res/drawable-xxhdpi/owncloud_progressbar_indeterminate_1.png create mode 100644 res/drawable-xxhdpi/owncloud_progressbar_indeterminate_2.png create mode 100644 res/drawable-xxhdpi/owncloud_progressbar_indeterminate_3.png create mode 100644 res/drawable-xxhdpi/owncloud_progressbar_indeterminate_4.png create mode 100644 res/drawable-xxhdpi/owncloud_progressbar_indeterminate_5.png create mode 100644 res/drawable-xxhdpi/owncloud_progressbar_indeterminate_6.png create mode 100644 res/drawable-xxhdpi/owncloud_progressbar_indeterminate_7.png create mode 100644 res/drawable-xxhdpi/owncloud_progressbar_indeterminate_8.png diff --git a/res/drawable-xxhdpi/backup/owncloud_progress_bg_light.9.png b/res/drawable-xxhdpi/backup/owncloud_progress_bg_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..fb146c33987eef5f5ef6f8c083db6396397f35ca GIT binary patch literal 1084 zcmbVLOK8(z91n`ys7_Fs__&1Zs7>;vk2IlmYm?TMnK`Z868eT+DC(N4);sbAjL-8Q!Ko1In2mR8=^e}cXkbIB)f4|@Vd1-XybZ_8T zfFOw8?2w$p>wf%lJze-)`S!URFGo?jfX3`1s;Mp{lDa(!$*ifCU=FJK?DR7jCy3oe zBVRxT<&3D=CawB5blr3?njqo>bw|~vAR;GW$*>aC*R^$uH1q^@KBBOSBf+vU)NtWg zV>+dkg(9>MQL56LSKBGEmS5bn(p0+|T9Yxt9w!C(t zaLSmv>M($28PoLRYFc|J2miXUt+kh*bs&?2o?Ue{T#sUZ2aI#Kvyg9yy%Ep41}=(P zk!`JNLJMW(1cm?5x}l3{AjQIAiRWdGjm7|o@gS3w0S`DX#BpJ+!?7J!$Vf4X2PuJz zqyb0+0Z4)zOU4Aivk_dI4mN9fNVPQB(KWDc8=Kq_D@ra@k?rPfyVB`^(Xx$fuWUP{ zG!`KhRWmIA?3bq%tqfgb2I?8tHpymwMPnO%R*10x@L`s3#Vr6eAc%X$R#>Jy?`|5BIk5wfrC-e2Uo6Ez2$AdkR z^6W?B_s5%k4_B81Z(dGB?=CGYQu9~#&23&AT$uR~4#+nSpSV2!YW={u+>4*Pj#R&2 zycLb@d8&_h!}!L%C$Hc4A6)shv~mCXyTz_g#NL_JwZ?pV3Ej|Is(}(7TVh7AT-62i$;iy{}KD*+%vc|WI_m;5JDz|kO|3{ME=S! zG9iRa2w{2d37iV$>b8K8QUrCiX;Q|y=(|d}x@{v^y5d2KLFqb(74bxfG=KmifB<#1 z*7p6g6Vf~BAWn*I6yrMEJru)WBb!A?(-Q+UDvC}|NV&QhoDujE;8itN8Bk8KH0oCX zt_$E7+gw`{(x|f2vLod7DH0tt84q3AwMBMywf=Ju zAw$^fa0bz@u|0x0DP>g&6lJIQQ)21vc>c%(kh{O%$Xav-vRgp zoc8EGHMwJ@^*e`>62e>HGVd}e5fgb-dbAqV;PRD{eqMyEbIHP#{H zGrp$|6#IcWV?D(gB=sy};Rk>ZKw>_GE^`IlVP+i2^l7yOP=}7*Absp8AJTIlz`xwN zqx(I8ZC!2d(lcgaHG1XL$`-(*s@KOlIJfUo^>JhXEg_r^NJ}Bs)w)slnTD?Ru>(+} z9MJVC=VI-XMMtMg&#C&PFbU#Fat>>I%06+d&awexLOLSk!TEA@#>~F~3x@qfxNG6t zwVwO2?Dw9DKE1T+4pYgY<1=O zFr!To!N~t!M#z8tXJkSMnGixIgpdg#6v&?%4>>{znGixIgpdg#WI_n;a+kj}Ef#+P Xx5Xv6*b-TW00000NkvXXu0mjfMr(se literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/backup/owncloud_progress_secondary_light.9.png b/res/drawable-xxhdpi/backup/owncloud_progress_secondary_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..6cae209f42bc7f7b4c64ff5c0f40583d76caa34e GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^d_Zi(!3HFAKD=TFQc<2Rjv*eM$tevD|9O@$x)qri z8W1m literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/owncloud_progress_bg_light.9.png b/res/drawable-xxhdpi/owncloud_progress_bg_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..fb146c33987eef5f5ef6f8c083db6396397f35ca GIT binary patch literal 1084 zcmbVLOK8(z91n`ys7_Fs__&1Zs7>;vk2IlmYm?TMnK`Z868eT+DC(N4);sbAjL-8Q!Ko1In2mR8=^e}cXkbIB)f4|@Vd1-XybZ_8T zfFOw8?2w$p>wf%lJze-)`S!URFGo?jfX3`1s;Mp{lDa(!$*ifCU=FJK?DR7jCy3oe zBVRxT<&3D=CawB5blr3?njqo>bw|~vAR;GW$*>aC*R^$uH1q^@KBBOSBf+vU)NtWg zV>+dkg(9>MQL56LSKBGEmS5bn(p0+|T9Yxt9w!C(t zaLSmv>M($28PoLRYFc|J2miXUt+kh*bs&?2o?Ue{T#sUZ2aI#Kvyg9yy%Ep41}=(P zk!`JNLJMW(1cm?5x}l3{AjQIAiRWdGjm7|o@gS3w0S`DX#BpJ+!?7J!$Vf4X2PuJz zqyb0+0Z4)zOU4Aivk_dI4mN9fNVPQB(KWDc8=Kq_D@ra@k?rPfyVB`^(Xx$fuWUP{ zG!`KhRWmIA?3bq%tqfgb2I?8tHpymwMPnO%R*10x@L`s3#Vr6eAc%X$R#>Jy?`|5BIk5wfrC-e2Uo6Ez2$AdkR z^6W?B_s5%k4_B81Z(dGB?=CGYQu9~#&23&AT$uR~4#+nSpSV2!YW={u+>4*Pj#R&2 zycLb@d8&_h!}!L%C$Hc4A6)shv~mCXyTz_g#NL_JwZ?pV3Ej|Is(}(7TVh7AT-62i$;iy{}KD*+%vc|WI_m;5JDz|kO|3{ME=S! zG9iRa2w{2d37iV$>b8K8QUrCiX;Q|y=(|d}x@{v^y5d2KLFqb(74bxfG=KmifB<#1 z*7p6g6Vf~BAWn*I6yrMEJru)WBb!A?(-Q+UDvC}|NV&QhoDujE;8itN8Bk8KH0oCX zt_$E7+gw`{(x|f2vLod7DH0tt84q3AwMBMywf=Ju zAw$^fa0bz@u|0x0DP>g&6lJIQQ)21vc>c%(kh{O%$Xav-vRgp zoc8EGHMwJ@^*e`>62e>HGVd}e5fgb-dbAqV;PRD{eqMyEbIHP#{H zGrp$|6#IcWV?D(gB=sy};Rk>ZKw>_GE^`IlVP+i2^l7yOP=}7*Absp8AJTIlz`xwN zqx(I8ZC!2d(lcgaHG1XL$`-(*s@KOlIJfUo^>JhXEg_r^NJ}Bs)w)slnTD?Ru>(+} z9MJVC=VI-XMMtMg&#C&PFbU#Fat>>I%06+d&awexLOLSk!TEA@#>~F~3x@qfxNG6t zwVwO2?Dw9DKE1T+4pYgY<1=O zFr!To!N~t!M#z8tXJkSMnGixIgpdg#6v&?%4>>{znGixIgpdg#WI_n;a+kj}Ef#+P Xx5Xv6*b-TW00000NkvXXu0mjfMr(se literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/owncloud_progress_secondary_light.9.png b/res/drawable-xxhdpi/owncloud_progress_secondary_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..6cae209f42bc7f7b4c64ff5c0f40583d76caa34e GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^d_Zi(!3HFAKD=TFQc<2Rjv*eM$tevD|9O@$x)qri z8W1m literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_1.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_1.png new file mode 100644 index 0000000000000000000000000000000000000000..2444d8361bd6eee706d6c1a73edb95ce2b355c35 GIT binary patch literal 462 zcmeAS@N?(olHy`uVBq!ia0y~yV3z{2xj5K>Wb^XqYe0&n*vT`50|;t3QaXTq&H|6f zVg?4jIUvl)J|*}rP*A4CHKHUqKdq!Zu_%?nF(p4KRlzN@D78GlD7#p}IoRyQo=rUr z42&M0E{-7;bKc%{%sOl!z|;F$jU_wx4{|9=+~yuK@1|*eyM8&BfuX`^CnrNnS{UO3QOP4GcD<`-?*;l82o5CjNil+1 z4Toh+n7}NCc1xgkRi(V$K;6@K*E1i8c%sHIVP+(2Ls*J{^6OpyFYh&(^iF4EZd1o^ z-+*;fe={VcpgDj~%JQ{Tbg_Nb2i3aybLL*FX2eipFSBv(PX31<S->P)jXDP)?cm%zGTQ{EAdw2lBJGhWC zj4qsFh%=5UoqzHB;L$|_%_8A9eWC5u&F#ZSz&1Qa#B)TvM?}+A+l}qIIwbYFz#0Ld z24k7K@9H`t?jqu8fi(gE|BIdg0HtIHHMx(7mxwsVy7u$iex^5qOV}sX#@E3)*=6I0 z*;fYu^%%?CJa+*ArluzVKq=WlO->hxZLDlR@5ZOVYNQ9{)a1;i2MPcr;#DXN@7YGS005@q*#m%5vV+=;eWP&^t6B^I000000I&@%8rhOI zdj$Zdk!NoE$1wnasd)APpp@*OHf>U?;dh7GlJo!#H9k+(%(yN9s7+ty=HvN10Dvj! z2>?(^c2JWhe(vd2>}MB^Y)O;UP-C-A<^TZa>C4>w;WeED05CN@0RT$L4rTHSvB1cCOizohJrdH?_b M07*qoM6N<$f_xA3GXMYp literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_3.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_3.png new file mode 100644 index 0000000000000000000000000000000000000000..94b63b5ca06823992a882b3a348f52194104619d GIT binary patch literal 673 zcmeAS@N?(olHy`uVBq!ia0y~yV3z{2xj5K>Wb^XqYe0&n*vT`50|;t3QaXTq&H|6f zVg?3oArNM~bhqvgP*A4CHKHUqKdq!Zu_%?nF(p4KRlzN@D78GlD7#p}IoRyQo=rUr z3{29VE{-7;bKc(dU3J?)fZ;(V$HMNog# zEvxf-^PX9-V`_>*n$e{rCue_`-~XpG)z0OJrSxMHB_+Pg7O9V)A9~Kd?RmC~jq8#3 z9TLkXKJR^Oa?kC^@{S+hU&&~Y*uG(eK z?hmH*vf(x_rm&j(9embz(;`+xZi8rLoWx_xg{qndp8~xaRaM&hm4o5UbSuULJ=3W{ z{_c5q*2VqTyWhS4R(0(Q|CyfZF;#CCO1!k=WmY(8zvk4Og%>#(bOKjvdtFmz*x>() zrD10j|8g_;yqcQ5|L*#JdwAU@aBW~fT-8i=o`5>Rg=Kr@urmY%uhx$0)_5(*a6`P5 z=|IfSr`@;KpFP=oJK)=UFY}x2+ZXcRabA7my(}|>#!5+s2C-5mhuHUBZrfh!{r=#m z1&jnBNHFYmdmwl0SnhiX1_#fx3=CUV2s6Aoma{>={APRn=jz?gd+an%JA5{bky6;e zS-Eb7>V}O*{0s}0g@tdqrUG)UKFGCumJ5G;zpwAkj~l1{#lBSg{UKYrSMx@gL$Vov zLdW%;i@zmKJI~0FvGS^@D#*R+AospLw6O@N<44us-Lu~uUY}_)&$^N4ASM?FM|Bx>FVdQ&MBb@09^zm A^#A|> literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_4.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_4.png new file mode 100644 index 0000000000000000000000000000000000000000..efe4948de025a038068563211c62db2289565471 GIT binary patch literal 688 zcmeAS@N?(olHy`uVBq!ia0y~yV3z{2xj5K>Wb^XqYe0&n*vT`50|;t3QaXTq&H|6f zVg?3oArNM~bhqvgP*A4CHKHUqKdq!Zu_%?nF(p4KRlzN@D78GlD7#p}IoRyQo=rUr z3`|;{E{-7;bKc%{?7D3r!f@fffRp%Mr z{EiprlzY8@f3A=goUiogw(vC$hAnHSauS`eTFlml}G#9{b5JPq3C~%C}-?NLUrM@1YC}!)q0G zhA0!0g>80yH?HDHzN+kSMxGFh$`Y_xS?jraADOg z;odC|*KN%+X9mUw5E#sKQ+9~7|Frp=6vKh7PlOmY_!coN2(2~BxE`B**Zb$ZJ9=^V z7W`DZeDUl)tAy@L5g}abY7^xc4u~wRNq(dA1msmkpjW4SD^!Ym|Fk3a^rY_(ia?IO zk|ARz6?o5Q{u$Wb^XqYe0&n*vT`50|;t3QaXTq&H|6f zVg?3oArNM~bhqvgP*A4CHKHUqKdq!Zu_%?nF(p4KRlzN@D78GlD7#p}IoRyQo=rUr z3`{DXE{-7;bKc%Pn0wnmgyF*d0|vWXE^=OCt$Mpu`1=K2BZr2xu0sM>IG@yX z@a*{_=OEEhxxn>t{iOIJyPB#$-_*CgEOwbQ=~{f0%aOxNWhZ~jZZ%}md0Xvb<9g(M z#|u5(-rjca-x7lHN{^0nC9^PmdwTEJk$b!hw^aL?x7PG_Jh!-Bd}MOz)300WKY#r6 zW%GG!`DwDZ7xfkD>U}HRC$ZA`Qr~Gl-UQRkH?JShS-|dm$nQ4;!v=zaTy;XC&^j>MxaMKo`5zOuKFsI4+-U15TqGwhD#h4fI^~+WWwkj&#$+45 zD?zIsPWjcL{#pC#^-I^o=WbtB(lO6IZMNJh<~NRYn_XZ2-6PL%V2;=8$s48J-ri+c zp!>-pz`O3S)63~Mj!aH{@^z~x-$cf5sju{=nBQH<#1JrZD?7uUc%Y)ov%8~p@=E-C z#DI|j1Rw5;NHKm}Dqp$xyBx!Tm^HQx5B^R%-Z<;ml8e(WTHgHh{zh5h@1FJHc< zYiHF^y5!@ADKfvD>=_y?r(RP}{%sC&aW~M#ldhF0EqiVC=;WSHziusAD=yXEEf}~@ zq4pAg0{^ZZz5PpD=6+*jm=T>>J85${bA#E*#}2y5{C!Vrk4*kK^;P!E*S)&pQvQau z5%-RMo!>Q2Oh){`ETGdGuHA{Ae`7bJ!|o@A3#J9ffNaWb^XqYe0&n*vT`50|;t3QaXTq&H|6f zVg?3oArNM~bhqvgP*A4CHKHUqKdq!Zu_%?nF(p4KRlzN@D78GlD7#p}IoRyQo=rUr z3{0w?E{-7;bKc%b%(`tL!S3fmA$7%alb&b!oh{z$&udsKum^0pSGuw^g1=307j*ABLX=(P_Pu3LYb zkzq~ht3`(;g&C%$>bKQu6z`aN+w)fOyydf!Gd3_(oQ`U5eSQU~$Wexg;Wp4$`?d)6 z1m{XTzq%3_6F_jFMyQuzPwL;f=T}-WG?;ccGbBU<9X!2i-S%huz9!7OSH1N4%c8my zZA(||e;@Wr>gTe~DWM4fi~liE literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_7.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_7.png new file mode 100644 index 0000000000000000000000000000000000000000..c78647de59bc5d4fadd257cf03118c71cf720f31 GIT binary patch literal 645 zcmV;00($+4P)YqZ$=4)5A23D$fP2>R8T(}bdL%wVJH91(&bhW@J)X@qufwB9 z(vf4X#l_%Y_3*i5EGr|bg&(3-V;#(o)q9*K|8j;Vk+)pxAN zVm_YMdh*{)FS2RQpB8QUn}c8g-lI%pma#>l5dheOT0XO6zYIWc#7AgHt)5fs)6;sK z-=BJU!Y!yB055N?Ef0hN;4PLPSgBoK_5%QDNiCnb^&wsRWdM31K0-T|1^?PNiuJZ0 z=Q(lU2mt$bYtylI4FI4Oauoo0O?-s5tliPrEfWF&000000KA(*BLM8%c;j*H8UR2m z04=HIGq?84_R9eD zLVSdFl=YqDevPM>^*GOoLgRLZTqi!MANY<%KLB`(AunT0Ezv3a006Y6md`BNF9XmU z@e$f_>n5^gpPts^{QjiSxSdn(AM_5n{*dTt!*KzyZwie7z}~IpGxo~>^hkV!cARpp f@mP;%bIt1?zOcQ%vB;e500000NkvXXu0mjfMM)m~ literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_8.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_8.png new file mode 100644 index 0000000000000000000000000000000000000000..1edad5a70370ddc33c5867f76e0c02003478516e GIT binary patch literal 631 zcmeAS@N?(olHy`uVBq!ia0y~yV3z{2xj5K>Wb^XqYe0&n*vT`50|;t3QaXTq&H|6f zVg?3oArNM~bhqvgP*A4CHKHUqKdq!Zu_%?nF(p4KRlzN@D78GlD7#p}IoRyQo=rUr z42&N=T^vIy=DfY@*mc`Lgzdq8#g@25Us&FgmRLVgr9FF2*N?v~mP`l4>?i&4`ec5x zpx5ZQ?D~&}C$Fp6&o^*qXsEvSO0v3)AxfqGpxOONd!Afcee?0HpT#xbcq+t~-EGUCX~jls+f=9!jxE=COJ<6VU-$aVBLGH?{nU)~Cl!10_{pXYGvpswHY0u58%6?eYi)^>)VQq*z zV{a0?+fJUH;liXS+s$7b6G7?~f$Bd$t9g5S=dL(wz6T5q^K^2vuB~Ha*y6O7$)W#= z{*Ao1oyXR_{p8CC3~C^F@4Z-%;l;@vA9j`TGAt0y5@o0Y`mZcmaQEe>-}i3HI`LY% zypALK*oO}{84r}D#;q1jPfnF#aPZFhdgju;yYpll!cN3*@V&X-^WFEHT`|^Dy}wPK zlzmqFdidH#33i6P5}&NjUxfw&P|F-!YlgKG_b1F=+J5L+@~&8r`jT^hov$fwmzT4( uFNkCK5GK{j;P4(Pz@Fc!GTR+v{h!e%V&m#tWvZeecYC_}xvX - - - - - + android:orientation="vertical"> + + + + + + + + + + #1D2D44 #AAAAAA + @color/owncloud_blue_bright diff --git a/res/values/styles.xml b/res/values/styles.xml index de8a0ab9..2cea91de 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -39,6 +39,12 @@ @color/color_accent + + + diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index be430aaf..d8967647 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -53,7 +53,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; -import android.view.Window; +import android.widget.ProgressBar; import android.widget.Toast; import com.owncloud.android.MainApp; @@ -120,6 +120,7 @@ public class FileDisplayActivity extends HookActivity private boolean mDualPane; private View mLeftFragmentContainer; private View mRightFragmentContainer; + private ProgressBar mProgressBar; private static final String KEY_WAITING_TO_PREVIEW = "WAITING_TO_PREVIEW"; private static final String KEY_SYNC_IN_PROGRESS = "SYNC_IN_PROGRESS"; @@ -151,7 +152,7 @@ public class FileDisplayActivity extends HookActivity @Override protected void onCreate(Bundle savedInstanceState) { Log_OC.v(TAG, "onCreate() start"); - requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); + //requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); super.onCreate(savedInstanceState); // this calls onAccountChanged() when ownCloud Account // is valid @@ -184,6 +185,8 @@ public class FileDisplayActivity extends HookActivity // Navigation Drawer initDrawer(); + mProgressBar = (ProgressBar) findViewById(R.id.progressBar); + mDualPane = getResources().getBoolean(R.bool.large_land_layout); mLeftFragmentContainer = findViewById(R.id.left_fragment_container); mRightFragmentContainer = findViewById(R.id.right_fragment_container); @@ -200,8 +203,9 @@ public class FileDisplayActivity extends HookActivity //getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setHomeButtonEnabled(true); - setSupportProgressBarIndeterminateVisibility(mSyncInProgress - /*|| mRefreshSharesInProgress*/); + mProgressBar.setVisibility((mSyncInProgress) ? View.VISIBLE : View.INVISIBLE); + //setSupportProgressBarIndeterminateVisibility(mSyncInProgress + /*|| mRefreshSharesInProgress*/ //); // always AFTER setContentView(...) ; to work around bug in its implementation initDrawer(); @@ -939,8 +943,9 @@ public class FileDisplayActivity extends HookActivity } removeStickyBroadcast(intent); Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress); - setSupportProgressBarIndeterminateVisibility(mSyncInProgress - /*|| mRefreshSharesInProgress*/); + mProgressBar.setVisibility((mSyncInProgress) ? View.VISIBLE : View.INVISIBLE); + //setSupportProgressBarIndeterminateVisibility(mSyncInProgress + /*|| mRefreshSharesInProgress*/ //); setBackgroundText(); @@ -1037,7 +1042,8 @@ public class FileDisplayActivity extends HookActivity } // TODO what about other kind of previews? } - setSupportProgressBarIndeterminate(false); + //setSupportProgressBarIndeterminate(false); + mProgressBar.setVisibility(View.INVISIBLE); } finally { if (intent != null) { @@ -1562,8 +1568,9 @@ public class FileDisplayActivity extends HookActivity getApplicationContext() ); synchFolderOp.execute(getAccount(), MainApp.getAppContext(), this, null, null); - - setSupportProgressBarIndeterminateVisibility(true); + + mProgressBar.setVisibility(View.VISIBLE); + //setSupportProgressBarIndeterminateVisibility(true); setBackgroundText(); } -- 2.11.0