From 47107757552d23a10f61e89e59726c0af77fa246 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Fri, 11 Sep 2015 15:03:46 +0200
Subject: [PATCH] added sorting icon from material, spring cleaning in lower
 resolution icons and obsolete Android versions

---
 res/drawable-hdpi-v9/ic_action_download.png          | Bin 686 -> 0 bytes
 res/drawable-hdpi-v9/ic_action_refresh.png           | Bin 3219 -> 0 bytes
 res/drawable-hdpi-v9/ic_action_settings.png          | Bin 1299 -> 0 bytes
 res/drawable-ldpi-v9/ic_action_download.png          | Bin 457 -> 0 bytes
 res/drawable-ldpi-v9/ic_action_refresh.png           | Bin 3033 -> 0 bytes
 res/drawable-ldpi-v9/ic_action_settings.png          | Bin 871 -> 0 bytes
 res/drawable-mdpi-v9/ic_action_download.png          | Bin 568 -> 0 bytes
 res/drawable-mdpi-v9/ic_action_refresh.png           | Bin 3138 -> 0 bytes
 res/drawable-mdpi-v9/ic_action_settings.png          | Bin 1372 -> 0 bytes
 res/drawable-xxhdpi/ic_sort_variant.png              | Bin 0 -> 229 bytes
 res/menu/main_menu.xml                               |  19 ++++++-------------
 .../android/ui/activity/FileDisplayActivity.java     |  14 +-------------
 .../android/ui/activity/FolderPickerActivity.java    |   1 -
 src/com/owncloud/android/ui/activity/Uploader.java   |   1 -
 14 files changed, 7 insertions(+), 28 deletions(-)
 delete mode 100644 res/drawable-hdpi-v9/ic_action_download.png
 delete mode 100644 res/drawable-hdpi-v9/ic_action_refresh.png
 delete mode 100644 res/drawable-hdpi-v9/ic_action_settings.png
 delete mode 100644 res/drawable-ldpi-v9/ic_action_download.png
 delete mode 100644 res/drawable-ldpi-v9/ic_action_refresh.png
 delete mode 100644 res/drawable-ldpi-v9/ic_action_settings.png
 delete mode 100644 res/drawable-mdpi-v9/ic_action_download.png
 delete mode 100644 res/drawable-mdpi-v9/ic_action_refresh.png
 delete mode 100644 res/drawable-mdpi-v9/ic_action_settings.png
 create mode 100644 res/drawable-xxhdpi/ic_sort_variant.png

diff --git a/res/drawable-hdpi-v9/ic_action_download.png b/res/drawable-hdpi-v9/ic_action_download.png
deleted file mode 100644
index 25476cd7f09085a39e5b29bffcbdeb102ab57f06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 686
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Ea{HEjtmSN`?>!lvI6;RN#5=*
z4F5rJ!QSPQfg+p*9+AZi4BWyX%*Zfnjs#GUy~NYkmHjS@7!SXp?X7pt3=B-#o-U3d
z6}R5bw9XC*6lvXG`h4OMH)+MWv0BpJ8?Rj2pEz~?f~ou_9y&hCF0KLG+-p_lMs##6
z+Gr5VC3?lnKx<aUF`e1UJc)AG&zzBcH}`Mp_k(+%uPHuvuX--CqW}v833qh;nfcc8
z!IAx^WBZLCm=}0oDhteAC9d;B#$dkHea{B@1F{P?G5zse{6@}rLBOlzh_ZJ|4$G^R
z)n|WEkYH+IP;}rBfKUM<v;VGg@to~ymhmF*LK&|G^PBexS!s=jW4+=Sbsu<s;(7aq
zInHBOESr7-!w<GOUhme;%}rR{?!JOqy`0yF`3IBE^fdbeWwJXa?fHM6ae4;ZoT*<H
zm>4<)aYr!RW4z2<lO?soe$}~t6ArIm95H^ct!^hjzuvI)QW~RYf1|X+XZz{V!Z#Ss
zdEU~fmWpAUx7=f%x!%==>`C{g?BkoTg>??Q-O`SG{gMf+JECVgd0dK4Fg$Lb-cXw0
zI7wUCK`4=R$8}}xD?z9BsJtu=^?s=Opp;#Z#fR~_s_p7E;uF5e?%=5Low#rBm0FfN
zYxYP_*}@i+>)q}9z;;8#lg<k_Hr5{ew(ITmZT<dp__x<y_~v|jd2YAok#B*wH?thP
z5pZthtiXML56gO5|BXAfTiJwPX7PdI-;9|I{+}aW?qQN)>SNe1aai!1T-sNW4~pkc
zSF&a-y_i4Mr9o$FX$F(Yq*YTg*i70q53IiOG0Zc`K{ldSMjRT2ju%?@Z<O!eInTv&
RCom;3c)I$ztaD0e0sxE>7IFXp

diff --git a/res/drawable-hdpi-v9/ic_action_refresh.png b/res/drawable-hdpi-v9/ic_action_refresh.png
deleted file mode 100644
index a7fdc0dfcb1dc50bd0ebd2527d174398b8470797..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3219
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

diff --git a/res/drawable-hdpi-v9/ic_action_settings.png b/res/drawable-hdpi-v9/ic_action_settings.png
deleted file mode 100644
index 86b54f4c71184c7f1f277b6c8e155e381c3855ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1299
zcmV+u1?>8XP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-UAU80vvZg!h-++1fWSo
zK~#9!?V3+$9aR*@f2X+6O(j8G1Pn;YwkB8?5xb}*A=)mC6jV@41zl8kp$Zy7q%K6V
zQ0${sXpsgJLFy(=#Sjz~voPgpKu{zuo{){=!?#Iy$3@S`b+|L{-kH2Hd7Tf!3wO@k
zx#yd6&%ZlRqehJyHEPtTQRCKxRQ*6zJq3(sT>b@E5Rt9EBtTUU0AF+wJ0l`js#?>&
ziVfht0GX*O7gRL?A<7+9)jRr*08{E{p!i5XTEJ+8>_lHVK~)_9J_N=hZaX9*?OkmF
zsyd{qGv?jBimU1jupX&Az`D&nkVkCZ^`2UQ?dk7;{WjDA=7A01H{fod;apG9viq*5
z#_t7=1H-BD4)C&wtk^S0fct@CMrsFmxTv+1Az%hL9dS#;O>$Iq2uQsBc53{o$hlWV
z<b}!z2ux`HT^#U=h_qF8+}`q&IkK04AAs9|w<99Qw1{j}MZl+ld-{xsTrtIc+aU|C
z*-rrH1MX>w$dR5qK~p9~`KN(vwpHdMl*eSxtLj_8w>DQd4BOgzYXPeIrN>dFaTZtv
zE*J3rX*7XnfQJGsA=(P|MJhiKpnOwAE}0V>>!R4I{WWvs#(-H7SuxpeR&b!#7BFrm
zorS}|UBG8K(coe_Y#F(a0kb(<>SxO-a;-%~wtMCSL}V>zPcB+GdpE<eO^e8!FJ_BK
z+bn0&WPQZlu-_d~zHla(L&7JjdN5;~oD2z5BC-jb$Z(9Kz`{-`Un&(g63(W^HZlsC
zMof%05`1s^xLH^yWm$!kFI@|m$+}4l8J4k7VET)mu_S?7cE*ksRemRmA-8d{=9p?a
zG;I|ix9y7#<}BShqEz#wY(HSg`Ty^X%Iwz?^Z(@;8{Eq+v0aC<1h}SsXGTf-K#BPW
z1FhnJBfvHJai`w@Px!JDw@4Q$ok@0#<f)98P#pp00IxbjN!hyO5r473BcAh&EqknL
zwsHbY`O9gKZ%NRKFMP#RYBrCrA+lt-{{Gb5rz#`BQQlYRykrSa%X4i$galLmql`*#
z&FY0TW{Z@<(Zx^~<r7TWZ&t@>5jdC54FXzW)4-p=H+ek>BdKQu40TyRQVyRmv&`F{
zEhk49=~8AlL}X4?KL}`%9ga!7Zi~#$wp6v*#RA4ub;cGvnDa)519}Tdq0=xzyD1-?
zbrx}gZwAPmR@KKvWG<(C4MD@YL8F1*{?(p4L347e0iy3DmSFq074eu>(mSvMXg=hg
z*!^FqBV@iHrY+v&W?OvIJp2>Dqn@IvV{v{-MAppTyg_(deA3G3-V<OX<T<&PXMe8(
z@4J10q<`lw+(?=r?qFn5L|*H881#h1WmB{Xd<^`UDC5L)-<$p(_&hZ}Wf`7N{v_}_
za1S?+#h!Ht?f?%K?Fp1R9kzV^M%KfPq(^|)i8~i?onXT^zdid9@Kc#@imEyuPamX)
z_>Jdx{qcB2<k$w@i@4=N70OrL5cxVnc73ljL}IL96Mw(omrA$$j(}7>pNFe^sU;SR
zuL5MQSGl07zZ4w+j^O`Z@DEe|TA4n7jT$v-)TmLTMvWR__y=jf$O5|?49x%l002ov
JPDHLkV1iuBQB42<

diff --git a/res/drawable-ldpi-v9/ic_action_download.png b/res/drawable-ldpi-v9/ic_action_download.png
deleted file mode 100644
index 41fe95a4097b59150dd699b6709d78a2c09c8b31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 457
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}EByV>Y
zhW{YAVDIwDKoQOYkH}&M25w;xW@MN(M*=9wUgGKN%6^wcjE76>)QQWl7#JAcJY5_^
zA`ZX3w%dz2P~h0d`^OUYggRMi8!r36TEi&K8t=#*e<bSQp<~CKHijO&CN3c2VjZ}_
zZ{Y%kdr8-xi72+r$T5>{k+pb}n3(?0T6|yUBMUPhZHY}!87v(PAC@OaIEb7x&l5;z
zHR!JGY0<GuW?di2cw|L;y5b$<_l-NAJ_(+nd7yfB(H`C^p63Ba+0&waC5W76T+^a`
zWmlop*9C2%GKp3WCh3ZYEYu3SOKq0&GI-xOC@z(|>8D)Necn~<=L#kMg?O`h-FT;3
zaY^kCuj#yuD)UxhneVT3ymknN76>SGRUD9t+az_kI)}BvKSz!8UccA@O|g$1ub22O
zvYUR%E8sxXEQX_cMwdAj-^f{Nz&m%%y;XDGGUX<0mG68T@Xq+nU)F$QHIwfxPYmn`
xeYcEL|AX+QIcg4!(=*Kz_f31w@L&Fc_|4OyA(wQXTLA-^!PC{xWt~$(69A*zv6KJ+

diff --git a/res/drawable-ldpi-v9/ic_action_refresh.png b/res/drawable-ldpi-v9/ic_action_refresh.png
deleted file mode 100644
index bd611e8e24d2e211a94d1658a49c823c4201716f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3033
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
IFo%f$0VKS%G5`Po

diff --git a/res/drawable-ldpi-v9/ic_action_settings.png b/res/drawable-ldpi-v9/ic_action_settings.png
deleted file mode 100644
index e2c2d517f576e0e68e8c4d7c20eec213b23b565f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 871
zcmV-t1DO1YP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-UAU812HT6ueSgI0`y5l
zK~z}7?UqZ3j!_uLf6s?u#<<ihNaSuN7Lq#)N+G2t8)4^~B$p@~my`vvFbQihvBbvC
z!expDO=%3d%pf8PG0gb<ZT_#04>R94O*ZD#+j-CXKIfe0`9J^Xe-8Av|Gh=26C@E4
zNa_#t^XGg-wEYtY5=U+T*{0<{ZA82&b)8%{H(vx)17rP+1~ztQtz1`d|EUL70v{98
zc3`Tc)TT!esFXAr80c|@q{YB|Ku$rM-=_o1fC@VslBy&PDwzY0B7jrCLZB6R1q=tK
z0>^>#$&@^>2G|BP0*`>fz<8hu*Z_1yMDZk)R0CWD`ubBJ;4yFrs00oGHIDuzumku4
z>;@*;DFNSr6%lc-C<Kx+yW$P<{?%ecwwiePqzv2b=riC5umu>GIDS7OmS$@gi@<H5
z%25miHUT?<QI6^saMR|qfjM^QmC-o^eDWUsB4Sk0LgT(t(ltpfk`7B+EU8t}1D9dp
zyake)B|Vc=D`}7I8zoICsG_3leTbwsNi~Tx^@Zh@jU}Cx^i<LvNfRW!mbALF%{wi_
zh<NWZdkf5To*N?Kms}>}n@&TG)0B&d`pl-gN|??3o{*|b@QRiBTo*i8<&CRMx(;Bz
zMdmkqV4iK7j8=b1)g_;H?x&bQEs~BEkZ`G_Tmc6b`CqG~<&yS!ZiA$uf8#-CW%vU4
zYB&c0>w#UsNayzsaNXu}ff<Pw90blKW%wo{W|t~N7hK<&5WNJp19jGdRERp9&L_Z0
zV6$y9&NN5Fl2V1J8o1=B!V5hIjykf#W;?)rU_bB~*b9s?cQPrijfkd_4kM#bXA~Z~
z6ej}Hd=Q;*<QR!{e(u`Q5l+`F-xcyD9Y&cN0%Z~L&f^MT7H}FEU?lM2^wCm%Eh5?^
zl>@_ocM<WSN3LWEGWFJeCFOiIBGx80KlA;k+;{6rmMqd>1V|9Ll-d+3WshD;eapFQ
xg2|`d!hd}&F9XW#Kzl@VbOv>A>urB)KL8e}!>JkCceell002ovPDHLkV1k|6c1ZvL

diff --git a/res/drawable-mdpi-v9/ic_action_download.png b/res/drawable-mdpi-v9/ic_action_download.png
deleted file mode 100644
index 2684c83ff1915368a2ff452e337096a4c8b9baae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 568
zcmV-80>}M{P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004XF*Lt006O%
z3;baP00006VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru
z-2@g46)l<eNY?-W0kug)K~!ko?U=z!R8bhke`it$MiI9Xxo8&#Ld#a-A0Pz&5kk_Y
zrS1wUuzkB+mk_j-T)2srEu>Yth}^WX5Jio5+T4L*8gcC1@y(0xx4Z-2z2|%L-E-c9
zAP9mW2&zN53)-FoR#WXFEsp@dfQOQfbM7}XfTm0UcX|jo1RA+F8-#!YIO`J7Udv9S
z?lTYqLO=)z0e^9kQCZT_Q2BuE8DJ4O2b`8~wSVsNhNkV64nMd7oB(gixN}(}`w83!
z=7Dy1fA@F_1<(W@bwrpJ@Dez!Gz;0j3A_fTuW*=gU<-IG>Acbzkn|mRk^VCM)N2CY
zfahfopKXXGeMnEC)yIAX@Kn;lu-!thfKQi*XaO6Nc82nO!1irm1DNWOKF5KNz_O%l
z$uz4ENZJF|Q)4=7j{!e`Cpiy45F?ZH9@tDBZ|@=CnWX(%*t_jX+iz{}+WumDt#%p3
z_FdbbZExD1sAbTyy=41d-M&gRE{G`3VO;+mx}=*6=}s>yjQfX@w*OVYJ79KDpG5j#
z4A_<QpiG>0SGK>_d!X$5z}Hlys^J?2_F~e5AP9nBSos59`-Kv9)waO^0000<MNUMn
GLSTZYEcQzP

diff --git a/res/drawable-mdpi-v9/ic_action_refresh.png b/res/drawable-mdpi-v9/ic_action_refresh.png
deleted file mode 100644
index bb9d855f77692343e173f814ca1e546393b707d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3138
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
MSl>bq2X&7AABcbM^#A|>

diff --git a/res/drawable-mdpi-v9/ic_action_settings.png b/res/drawable-mdpi-v9/ic_action_settings.png
deleted file mode 100644
index 47ef3f442902f84f4ce9a44f829441692c5840ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1372
zcmV-i1*7_jP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-UAU80~~H7^TGfC1nEgc
zK~!ko?U`$cRaF$ne{1f{IF6~471;wx3mlB7smLBfffPNy81$tylOm$fsPIz+1$~P?
z1V$u9lZ2IohGZ5L7T5!W(h;K)9Y;*@)o4D)8J+p}<$q##8k;kCu36j#n|trs=j^@K
z+H3vSf1L|8sYy+0^1l*Er!_xPiL#ZC2qaw%TnY>(`|JnSMMVEuYk-Xy2Ye3<<fbaX
zoQU|Y%>C-B5IXHZGtfB1xW8<Nm1aQ1pNBaII5EU61HjE^tpPrTF~F20_VY4I(zG*f
zKo%a7kaW%|?imj}2ArGZSDi<8JT1Un-&+b=#R$>mQQ&T1E$|Jn8TcJ|5O@H%*52O-
zYy=K@i6+lo;5|Emr4iBL^;>|efE$6Hi0H`nEDePuO$C+$<Ne$b;5cv+I3E}dYyzIQ
zg7Rqu@S9Jf4R{fl3iR600VntvkE6ij5%F~?A>^>B2cED(vX`5I3BW|44|o~4!`^-a
z*a7@tNZkp1=(&4*Z!d5WaB<>*K^rkkQbUn2DjGsp0-xC1c?WEF?2iLp0;U1|Lm*Mb
z25bUe0J?!Cxq_F;XyDF>*mzn7B(eX6(IsD;dV$%%y~g;aT=lIa5URxJe&9V|F|g8J
z&l|fnB4!Mi3w6U`yQB(mNuod|4Zt#>-pV&x`3i6tSZ@z6@%MwC8}u`?fXjfl{A|8v
zv`RX!NFo=3&&iU$lGH7!%b(v$s+Y7XxxPcvA}4%)tx1wzm9#TiW3{A4e{S>jt)81#
zDn*bqMbeMnWS69wl5X<%E-SD|QgaRf(zQlOT9_!iThi^4ZjrRd*S1KSFDXi6uZa=u
z_TVl_Es|c7^s6`Sl+;>atybULC26~)cO{KYJioZAJYUj2Nh|$*Pjc*^j$p0jex^&(
z0Ym0eNqZ$VjKuSWxsVe&s{?z|P;qj04!3bK_e+9MeXh`ly!QAUIXq)zu8w~}MnvW!
z;(+n}Lg1L|K)Aq7AI@{hTx(KO1oR|4si$-UvW=Z!M}X_iELXZ708Eh7R*+L&Zp9mb
z)vg0=E^xC;%Yh_uL(+VATUn)@;cA*0Fcx@H(%651(PrQo8=n=!4&Vk?@jl==Nz<Kk
zr6JHfL)_M+2z46QKS~POZb=<OorK|Yk&9in#wr)Xw2*a6S|e$4k&}o5%8voIIOg+I
z;%(r4U`28gb*2(KGh_m;G4pImV!z+*XFIUKzthO*1FnmRqh*k}Wj^LS!|VqhF|B^Z
zMie1)$K6}3a2PgKjm%k|wMX*OWX1QJ(EVg)*<giFdSnUP?0e=|`Gvmrx850esz^Pk
zD+r<8z{iP4GZ}P4(*eu`?lZMslXO_wSd&oic6)x(5WPSJ_yG91w1y^QlfZI!Pe<JP
z9rKv#)97)__<2MemNd~`+--Ea4S3phpcmL{g-093!uc~dBGy-<sh{N{wiehB5yw3L
zkXyxDlNev`o);IXHXB(FtOMSOh$WJmY*4#DH$=pnr8f160e@LE{cVh206grNk7Rv$
z3;?eK9T9PGh<zG?6A_`(-%1oTbh5+jRPTLyfV(1M|5-`EBBI;*aVlr+DpUDtz1;oG
zah{h(V}Ggt5me*l?g}GQe=_=fGGC5_>;GH-4^)6FJTi<w32Xy4m#KW!+Ridw+Sa5d
eHL1yeL;e6WyiR82mzSyl0000<MNUMnLSTYMae4v(

diff --git a/res/drawable-xxhdpi/ic_sort_variant.png b/res/drawable-xxhdpi/ic_sort_variant.png
new file mode 100644
index 0000000000000000000000000000000000000000..2918126d1c9a40b571b8562edbca4129f081bc46
GIT binary patch
literal 229
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Y)RhkE<hRxemd{22U45`9+AaB
z8myGT?PRtcNU*HHF&!>=uJQvbkW=94;uunK>+KCoz5@z8u8t@EzJDY0Q2EFt4`Wl-
zy193yfNB^Htg!pEV%4i}?%R3pSI_ys^Y6*^!Wse~$icvn_UF?b!=hyoM^_1Qh=3sr
t1A}qjJZrysnqeEWSeRJBkP&2%&SxfbMjj<|d4szkuBWS?%Q~loCIEQmKV|>`

literal 0
HcmV?d00001

diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index 236bfd6e..bd218930 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -21,31 +21,24 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/action_upload"
-        android:icon="@drawable/ic_action_upload"
-        android:orderInCategory="2"
-        app:showAsAction="always"
-        android:title="@string/actionbar_upload"
-        android:contentDescription="@string/actionbar_upload"/>
-    <item
         android:id="@+id/action_create_dir"
         android:icon="@drawable/ic_action_create_dir"
-        android:orderInCategory="2"
+        android:orderInCategory="1"
         app:showAsAction="always"
         android:title="@string/actionbar_mkdir"
         android:contentDescription="@string/actionbar_mkdir"/>
     <item
         android:id="@+id/action_sync_account"
         android:icon="@drawable/ic_action_refresh"
-        android:orderInCategory="2"
-        app:showAsAction="never"
+        android:orderInCategory="1"
+        app:showAsAction="always"
         android:title="@string/actionbar_sync"
         android:contentDescription="@string/actionbar_sync"/>
 	<item
         android:id="@+id/action_sort"
-        android:icon="@android:drawable/ic_menu_sort_by_size"
-        android:orderInCategory="2"
-        app:showAsAction="never"
+        android:icon="@drawable/ic_sort_variant"
+        android:orderInCategory="1"
+        app:showAsAction="ifRoom"
         android:title="@string/actionbar_sort"
         android:contentDescription="@string/actionbar_sort"/>
 
diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 7d7cea1e..c2eccda0 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -480,8 +480,6 @@ public class FileDisplayActivity extends HookActivity
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         boolean drawerOpen = mDrawerLayout.isDrawerOpen(GravityCompat.START);
-        menu.findItem(R.id.action_upload).setVisible(!drawerOpen);
-        menu.findItem(R.id.action_create_dir).setVisible(!drawerOpen);
         menu.findItem(R.id.action_sort).setVisible(!drawerOpen);
         menu.findItem(R.id.action_sync_account).setVisible(!drawerOpen);
         
@@ -492,6 +490,7 @@ public class FileDisplayActivity extends HookActivity
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.main_menu, menu);
+        menu.findItem(R.id.action_create_dir).setVisible(false);
         return true;
     }
     
@@ -500,21 +499,10 @@ public class FileDisplayActivity extends HookActivity
     public boolean onOptionsItemSelected(MenuItem item) {
         boolean retval = true;
         switch (item.getItemId()) {
-            case R.id.action_create_dir: {
-                createFolder();
-                break;
-            }
-
             case R.id.action_sync_account: {
                 startSynchronization();
                 break;
             }
-            case R.id.action_upload: {
-                UploadSourceDialogFragment dialog =
-                        UploadSourceDialogFragment.newInstance(getAccount());
-                dialog.show(getSupportFragmentManager(), DIALOG_UPLOAD_SOURCE);
-                break;
-            }
             case android.R.id.home: {
                 FileFragment second = getSecondFragment();
                 OCFile currentDir = getCurrentDir();
diff --git a/src/com/owncloud/android/ui/activity/FolderPickerActivity.java b/src/com/owncloud/android/ui/activity/FolderPickerActivity.java
index 4b558f00..574050fa 100644
--- a/src/com/owncloud/android/ui/activity/FolderPickerActivity.java
+++ b/src/com/owncloud/android/ui/activity/FolderPickerActivity.java
@@ -263,7 +263,6 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.main_menu, menu);
-        menu.findItem(R.id.action_upload).setVisible(false);
         menu.findItem(R.id.action_sort).setVisible(false);
         return true;
     }
diff --git a/src/com/owncloud/android/ui/activity/Uploader.java b/src/com/owncloud/android/ui/activity/Uploader.java
index d221bc92..83b029f7 100644
--- a/src/com/owncloud/android/ui/activity/Uploader.java
+++ b/src/com/owncloud/android/ui/activity/Uploader.java
@@ -658,7 +658,6 @@ public class Uploader extends FileActivity
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.main_menu, menu);
-        menu.findItem(R.id.action_upload).setVisible(false);
         menu.findItem(R.id.action_sort).setVisible(false);
         menu.findItem(R.id.action_sync_account).setVisible(false);
         return true;
-- 
2.11.0