From d474239b21f01465975ff43944ea4c2981802ff0 Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Sun, 26 Jul 2015 01:49:27 +0200
Subject: [PATCH] initial material design changes for the action bar

---
 AndroidManifest.xml                                |   2 +-
 build.gradle                                       |  10 +-
 project.properties                                 |   2 +-
 res/drawable-xxhdpi/ic_action_create_dir.png       | Bin 0 -> 503 bytes
 res/drawable-xxhdpi/ic_action_download.png         | Bin 0 -> 351 bytes
 res/drawable-xxhdpi/ic_action_upload.png           | Bin 0 -> 325 bytes
 res/drawable-xxhdpi/ic_cancel.png                  | Bin 0 -> 920 bytes
 res/drawable-xxhdpi/ic_folder_open.png             | Bin 0 -> 442 bytes
 res/drawable-xxhdpi/ic_hide.png                    | Bin 0 -> 1112 bytes
 res/drawable-xxhdpi/ic_log.png                     | Bin 0 -> 461 bytes
 res/drawable-xxhdpi/ic_ok.png                      | Bin 0 -> 460 bytes
 res/drawable-xxhdpi/ic_settings.png                | Bin 0 -> 994 bytes
 res/drawable-xxhdpi/ic_view.png                    | Bin 0 -> 1046 bytes
 res/drawable-xxhdpi/no_network.png                 | Bin 0 -> 1015 bytes
 res/layout/account_setup.xml                       |  22 ++++-
 res/layout/drawer.xml                              | 102 ++++++++++++--------
 res/layout/drawer_list_item.xml                    |  23 +++--
 res/values/colors.xml                              |  11 ++-
 res/values/strings.xml                             |   1 +
 res/values/styles.xml                              |  14 ++-
 .../owncloud/android/ui/NavigationDrawerItem.java  |  12 ++-
 .../ui/activity/ConflictsResolveActivity.java      |  10 +-
 .../owncloud/android/ui/activity/FileActivity.java |  36 +++----
 .../android/ui/activity/FileDisplayActivity.java   |  12 ++-
 .../android/ui/activity/FolderPickerActivity.java  |   2 -
 .../ui/activity/GenericExplanationActivity.java    |   3 -
 .../android/ui/activity/LogHistoryActivity.java    |   4 +-
 .../android/ui/activity/PassCodeActivity.java      |   3 -
 .../owncloud/android/ui/activity/Preferences.java  | 106 +++++++++++++++++----
 .../android/ui/activity/UploadFilesActivity.java   |   1 -
 src/com/owncloud/android/ui/activity/Uploader.java |   5 -
 .../ui/adapter/NavigationDrawerListAdapter.java    |   9 +-
 .../android/ui/dialog/ConflictsResolveDialog.java  |   6 +-
 33 files changed, 270 insertions(+), 126 deletions(-)
 create mode 100644 res/drawable-xxhdpi/ic_action_create_dir.png
 create mode 100644 res/drawable-xxhdpi/ic_action_download.png
 create mode 100644 res/drawable-xxhdpi/ic_action_upload.png
 create mode 100644 res/drawable-xxhdpi/ic_cancel.png
 create mode 100644 res/drawable-xxhdpi/ic_folder_open.png
 create mode 100644 res/drawable-xxhdpi/ic_hide.png
 create mode 100644 res/drawable-xxhdpi/ic_log.png
 create mode 100644 res/drawable-xxhdpi/ic_ok.png
 create mode 100644 res/drawable-xxhdpi/ic_settings.png
 create mode 100644 res/drawable-xxhdpi/ic_view.png
 create mode 100644 res/drawable-xxhdpi/no_network.png

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5b9fc717..7b4d742d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -37,7 +37,7 @@
     
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="22" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" >
     </uses-permission>
diff --git a/build.gradle b/build.gradle
index 209b7ee9..576eb82d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.2.3'
     }
 }
 
@@ -20,15 +20,15 @@ repositories {
 
 dependencies {
     compile name: 'touch-image-view'
-    compile 'com.android.support:support-v4:19.1.0'
+    compile 'com.android.support:support-v4:22.2.1'
     compile project(':owncloud-android-library')
     compile 'com.jakewharton:disklrucache:2.0.2'
-    compile 'com.android.support:appcompat-v7:19.1.0'
+    compile 'com.android.support:appcompat-v7:22.2.1'
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "20.0.0"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
diff --git a/project.properties b/project.properties
index 3abf7906..b7cabddb 100644
--- a/project.properties
+++ b/project.properties
@@ -8,6 +8,6 @@
 # project structure.
 
 # Project target.
-target=android-19
+target=android-22
 android.library.reference.1=owncloud-android-library
 android.library.reference.2=libs/android-support-appcompat-v7-exploded-aar
diff --git a/res/drawable-xxhdpi/ic_action_create_dir.png b/res/drawable-xxhdpi/ic_action_create_dir.png
new file mode 100644
index 0000000000000000000000000000000000000000..7bd3c8fbc6f39dc978eb7ccfebeab0cefe130e6a
GIT binary patch
literal 503
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Y)RhkE<hRxemd{22U45`9+AaB
z8myGT?PRtcNU*HHF&!>=uJQvb0|R4|r;B4q#jUru_WCj#%CvpF&Y{XG#BIR5D5YZq
z15d+>1eR+FOcJaYRTbP47@1g2^p6U5D($Nm()*@bS@-s?=Qrj1?Lyu_QyCiWZM5A`
zoBR9XxAxt|(bajeM=UqlzBD-X&1IAAmcM(BS<IF_`OUY{Vz%_jv&PGpob5{ay|-XN
zoST<!V@!2H_9xAku9upZ?4EL|{PxM+5--+oT(Wt}rRaApvHU8Y!k)`Dm#(j5|DM&q
zj@?fs_8Fhhio%K32XwE^ST=?4xvatk9T%_S=z?xm4v`z{Z5u+L<h7UDh($O8oy;Mk
z5YXTNWh^L{@7mdaVBNadZ^@HH5i&3CM(0f2&SPKxg`<&)g-bxgVF3e#abY+AQP(Md
zqUV5AFVMZP<=X?UQ|GqoUdVnMC_ZIwcJzYZw-)PZSYO}98{+KgpY`oS?&hmzh5zCV
zf;NYiMfa-q78Nd;CTfygt?<(8(#|Exp6pxGzxsRUs<4AXZOV6MFSX+wdYKA3Ag-sY
KpUXO@geCwt=e#=r

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_action_download.png b/res/drawable-xxhdpi/ic_action_download.png
new file mode 100644
index 0000000000000000000000000000000000000000..95502de3f1c91511b8b179b896f866976bb661ee
GIT binary patch
literal 351
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw6p}rHd>I(3)EF2VS{N990fib~
zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s
z6uj=~;uw-~@9mA#T!#&KTmpZeeqC3&%R^zxvaL&IIytR7=zaJg|4E<tTRYv@SvUk1
zbT=uTwo-6tU|?hdaitsFs%QLPao%i;?59a;b8bxh=@IPrg|E_s(eF>t>m>r}pHG<t
zO_*H$tu$!H<h9PGK~0nOdn$vvf>&O#44M?2En65gEBI}yVNhdm{<`9z&c#oh_j|hb
ziAB_^PqoZyD)SMts9N&fbCN}0&&RncMK%kc`%SW3CsL*=X|XS&BImP-!fghY7iA0T
lE3AQzTHy?K*9)fw;x4M4jL}V}Wq@8}@O1TaS?83{1OPBPeft0a

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_action_upload.png b/res/drawable-xxhdpi/ic_action_upload.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6c31e93228dadd8e1c5eea2b0152272e961ce6e
GIT binary patch
literal 325
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw6p}rHd>I(3)EF2VS{N990fib~
zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s
z6x{3S;uw-~@9m91K4wJ@*NYoxw(c(8)vS4l`Rx-s``#x<j%e`hK6fhJoIyarp~0o}
znW^hkAH!ucXZpJ8%DTG*6{)D`x;q3FUsADE_gwX0iHGSNmX%$?YF7)JmU#Jfgq-G_
zu*&lElB#n`E1NgFyn3iJVV6Z-ko<AaS5J0$?3H29WU05eIqkOOL-uW;`F)%~g5fRS
zg8j^{@ja=QdF>30r=I;Yj4$Mn|Go8b8Hd1voE@hb7@4+MH!!4rX07In=m-fjp9b^@
NgQu&X%Q~loCIGyWaJ2vc

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_cancel.png b/res/drawable-xxhdpi/ic_cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6f7844defb4822385405ca6414c2449859d40c9
GIT binary patch
literal 920
zcmV;J184k+P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00R(7L_t(&-tF4WN?Sn`!123kQmxumjnZeS)u6^?QEL}2
zd<aGPgXn9xa3P3NXa#p_>_SkZgsg1o1BiPO6gNo}ri);!N#@MQohuf?Y=_B@+_`7Y
zIddbTmo=ger~~SN9!57gmf57j1y|ImbHxP}Hdtbu?&kyzu)ryGlrZX?Fi(H-pe#l1
zMatuG&mP0cfySs<Qyz~p+3=wEY<poI#ukGiK{MRO;wTh1OosubS&NN%7^|e>g5FXJ
z#!)B^>5T)*@H;3+q4+5W1Nq+x&uNf)eL(5J59{$b((ffbXe}{LV|zP-W)kHnlr9M9
z!r*P<pquugvOQ=!agIXq%@#B!F0;!NRjVJYGRY5d#)uuLB63nh6f8(pazv!q7v`MW
zfU-tTL`2>|YH%VVQWS-GLuOFXf@326<1|Qn!kPxqfRKKDZknqjJ>^71OljA=Yd%Pt
zK?~wz$T!WNXhUk{$UAOM2Avvq#)N_7%2AXg&>KVQZX&sJ6g9f^pqy27(UE*O3dN`%
zv}_shnn^jT-W<iE9<*s0^jm*C=gm>9>p}KqPAkcmqbTb^7Y;|GL~`LM&h?-xr_)+T
za^om2^`N?A0@04-%2Cw*BhZU`WT7^7KGdcT_uA*fy!IR3oI*<`kPi_Um%KSu%jCrI
z=ot6r*d-^<hikV*`XQZJKBOA2r3CFH2FH(dEN6`Ku{iqVM8E2+49W;e{wK=-*b1K%
zlKgk3GDu&t>^~`k3f5&%TBu)l%yrqY@b?z~k_y&^Vp=SxKiHJgWnqCm$5LA6l<aEz
z?6Wl+hHTq0ThG#t`D))E8ssK%&NUgAmfm#Ypf9dX&(%aZEACy`6o-j%4tV9$IPc?E
zBAhdNe6JSz6Cj;69~N$xFMS*Zepo$mucuN0xA%&E@3>vyO$Ufe*SZ(o?}~Gf?=hot
zCj2Gvh@s)9KSGC+yC(n0E_c?HJ9b(VjPM^4^fO0^njv*RW>$W|Lw{<~#VCucQ|6pY
uYSg&ooHFYyGWxWV=zJa10d+txY5W0V->`*MDIA{w0000<MNUMnLSTZBx}eVh

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_folder_open.png b/res/drawable-xxhdpi/ic_folder_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc826f4ab947ed40317f6cd722939cb91c8e4c7d
GIT binary patch
literal 442
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw6p}rHd>I(3)EF2VS{N990fib~
zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g&?
zz`$ta>EalYaqsOddoN~3k>elVyLfU`FsX`nxQIA*n`}F%ePd~7>!f2<dmT3jW$$g8
zmLxsNDQTU6e!@iiv$tA(5~iQEn(6ao`{g%!XC5DZe0FwfM6r8BIAbG=kcUDe%P-{>
zCwOD)I*fa&zc0AE^m%QZ<vAN`rt2%_?wUKd+%IfaedELA+67`~rz%^h-CV$~Wtn85
zdeb%btfXpDxTjf$e)$}Y%d28!gnw<(T-w}oye;_A6h2$NLs>nh_cYqBuI%5zm-~7L
z7jMaoZKXf7KUCC(UweMso=GwlWVw(>Zy=Zg5gHp#+x?xPH|OWkdpwVy@bH>Xnv!Vr
zB2{_8^OOt9@%Jp}+o(1#Gm)rx7GvZcovM5;<MMXyT;HX49#1RY_x8Hm|2htp2@Xu0
cTb?e6_goniqAvfb5E!Hkp00i_>zopr0QZKgkpKVy

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_hide.png b/res/drawable-xxhdpi/ic_hide.png
new file mode 100644
index 0000000000000000000000000000000000000000..394b85e4f72fbeac1436147b9e8973274a7f4d7f
GIT binary patch
literal 1112
zcmV-e1gHCnP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00YoTL_t(&-tF2;NK{c6!13`h1}!Qhl~zFnJ-{$j8nUP;
zs+EzC%E}f+TBFzl{}dHHs5Z6e1r>z7ghHYRR?sE_35s0UqD-WBR<x5Ih_9xFJ?^=4
z?mgd~8OK=+XLT?4ob$VL&-u=4eE1S8`I4X{C<#h}5)S02i4}<h@^h0AeIrNGaY7?W
zQZJkSa7K`%UY5}3i8P)7Wdzy9KK8JkYL+vL%viRe68ep#6bjhM9X?y0RMUHI0W)LM
z%S@!bd~t->(<hFTAAKBhC(Yoi7&MgHsKg&#U@VO>Da1!Mk`_&*E{i!S#B&xzGjt3G
z=@;i26Zu%?9t2d<pcwVay_vg#HY*?<sf&9A$!9D+GRPu8EzP!E;i;F6-a#oG*A&%9
ziSkscHtz)X(``T<_6AC$(V-wa$tmS1!;mhWBSi{Ib>w&<`KV#Qm2^f5I%Rk_IjP)0
zIv@en3VMp16f~5y&IFpPL?1b65}kB%nWbSQ_qNnSt{W(m58`-YCr#laAwoQ6nyq=e
z_qcXOJA)bxhzGXlttWkFp>qGAq0|#jpe2Tk{Y(rSP@G89mAK>{DhDahfzs(PfbMI@
zI6di!a`&#G<fl5&7GtZ~>M-o;Ny{wv>WpQV*+Cg}88gjxoC)Yijg~t_#<Dy94nu#l
zY!LLT36?5e8GGDY%XPM(^kNm%CdgtPO8dhayq#nPjS`gpPzALLvSe7Q=+*Q=l{6V^
zhcTDlqJq{5vSeARc&!Z!P6LYMla;C<zaT~jELB`_h*Wyg9Pf=<(yVJORV;N3o;uPF
zW7!qqaVU)!hD^;$C67Ij9vDh){Xbc=W}DA1!(7<f@u%@kNJ@8EbPugX0#1W#gW*l~
zqrQNY<i2P+?L69#<&7(-n;hl&sXU6B)af?;@KI<OnVZ7e$08c&;0HfxSHh)?)I*+W
z3R`9PY&A$%yAo2RWRic(6*NG3%t(i1tBw>d7)ZgGkj}~%im6;Oe7GiC^L8VZYDpdz
zibKEBQ3I))gGyYou0UFBJuaMdB$CaBEyitwKJHRS5!s9)ogC&-&qK{lh@F%f>CwV$
z-bJtrq>oFbu{rC=<YIhD67^zU#*ZXhp{KD)un33=Nxp;ZXFbn`pX7C?J)aYN@~|0v
zk^<H$n=%GcWG522)N{k72X=9rdh-5-J`bem&Tht$M=@1wV>kPNYDy?%oaV_jQd0a5
zo+@Odc%FrcNbx<MTWu!A`^0dSLb{p=$K)&jO-`<po*3u$<@7soM(U3QWn9y9l7F>G
ef|8)&Prm`3!r)ORl)Q}q0000<MNUMnLSTYuG4S&M

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_log.png b/res/drawable-xxhdpi/ic_log.png
new file mode 100644
index 0000000000000000000000000000000000000000..50f854ea5a07043f9e947b65c2e0f804c20d3f1c
GIT binary patch
literal 461
zcmV;;0W$uHP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00BiwL_t(&-tF2wN<&c)#qs}Bhz}9$1yS4B7z@QUxCHG5
z1q&g)F2G6~>#QN9wGu&v6mG!A+D;L_YLy$AxtW(db7ldDAH%s*-J;ESO(Bp#lLcz9
z$1Y9gjHxFaM}QXSvgXWnlhU9D*R(Qr?<A!`2b^ct!9_}guGn%Q9$3mFr9n^3J3uR3
z=8@8%H>N!mU^$PJ2E8-o0+C0G0A-P4KpCVcked_-a*`rJE>bMWL5c>MN%0^fsS1#Z
zR1L^LstWX*R9HbD1HwI^pQJGWeJ51}%BBk>kU#>}4`gM24hv)q5=fx>f=2f21rlgt
zK)OQ$38XtDkU(_-y)YBVd1lrMx??>Mbi;-fbi`>O=#VojsN|N_AWol6UacTlq!&W!
zv(00&>jS@9l<c!ZlX7TPzNf=QYCC^}Mlb>i^zT4lo3xiPaL!4n00000NkvXXu0mjf
DC$OxD

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_ok.png b/res/drawable-xxhdpi/ic_ok.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e03d54cf42955e7a3169bcfbe4649277e729727
GIT binary patch
literal 460
zcmV;-0W<!IP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00BfvL_t(&-tF2=Zo)7S1z>|X00$@}3oghF=4R~?*z?m$
zJ;-ChqA1{a#>}&kIuj`yN71L)@jOLYAiY;DdjkR#pa2D^Hy}U(3ef)mt=|hYrbCkK
zC|VyQegFXSe7qMYOX|nTkXo*xF@2?>cvZKj(|O92oK~Pg%V`4|@U7*v0GT*^kdea%
znK@ig1&0Z$;_yI~92TgW!vPJr)N&Z0mpJ~Q7di8w9X|2VmNN(1;TOQsKyu*ZK{pNz
zBo|H&^v3~!lY->L$$|Eho0mviFHU~S#6WW7%q{9i(uU8Of9*9SXHIEjERozf<(+y;
zI^U5998K%UktiHpFMCEJakS0#kwoI?yZw|z;#lH`wBXqCknlOyfF^8?JuwQGQxjo@
z$*IfK!s8&VDn8B0-Pyes@gqTi0u-PC1t>rPYFk(0+Vf$3g+;3X0000<MNUMnLSTZh
CO1XRh

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_settings.png b/res/drawable-xxhdpi/ic_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a70402b4f85220a29aa1d15dfc9396ffafb6247
GIT binary patch
literal 994
zcmV<810DQ{P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00UY{L_t(&-tF33NK`=_$MMy?P+C-8BV8>-F%gj-3`vLx
zdJBRii9!qu3n~h}Z_x$P)hNR3B7q>3f+j?_$3iWl3u%fZ(S_2qi<Oy{W#Z|{t<{}5
zGmB1A%e<Xse&@rPb7uZ$&N^_+tmg28{2)JQye*>}OVGMVF%K#hax5$knFrNNK{e(<
zty0i^^PoW~=#yzstdwJ65n&dTV+&eg7PQqCw8bo_#1?dTszHG?&_^YilYR+h2d`~G
zT@(>Isqb>m@t#@&^g)I0=m!)M=02WBmn~+zy<(%gUpU)&=>8>N7c`G|9?=7wA%j@1
zD`UpnRieqHk}n=ddkNPA9rGIgO`9X`<<bEqGvd>!b=r59s)MdgJIBJ}k}7De5srn$
zY86lrkBx!anPm^!V~k^AvC|F|NxxCh2NuXdXSE~8XrYP{N~ofhG41{*WuV23YK09_
zOuR>e6Bk2T89#{<gQB&jzMI5(oiv;@X`~D>Up8df^e6_^5+qy)gQ-(Y=_bqWDT|>|
z>FNYY%ZOl_6;f_^4wq<R3=*tlf8INBwv~<3_FgKTJPU~z*A3DlzF4W)DwQM*uwJ(w
zN~KfypvNnL5`>dL2g$yau$u&NEy@LHn;;?Ax0-sNAg)RoR4qu@?HlNTAg)9i<Ps$8
z|3^T3XWEd7Zt7NLQ2SKg)M-2sKK4!}PNML!?<7?hlqa2MT}q%b>0F<y4hp8+c7=8-
zTpzp2;kdW;aB|QhZYeB_O$19hA>39-X(YxDl*1dv!l6z=3gMz+N)OpGP!z)&rB$<F
z;1ZRt&UpLkSyfLQF1-?Vh*A<JV9GRKxJQVT4cRFliu^XJap9txb{~rT6Y_g#As>yt
z2K9MX)ZU)5T}DAgDzDNV#yF1%RGApp7z3?RT{<os;WVhPWl8*)cFr(MbQag6f_cZ6
zQxEFAxrjh>dF#==pK{WO;)*t>o(R&Z;PZqfBTTm*`n^|whkRzckLU728S|8N?tXJ9
z;I92XzZeui4c%0b?xj50rm$E2k^(Q~MFywo<-9K&=QHlpg1i;jf;O84t+WMY{pTO>
z9234>{Pj<q4qBw3d*(s%O}h)`K}V#ZgXTdgJZDtUo{{ALGm0PN2hCK_FRA1UFYn}B
Q5dZ)H07*qoM6N<$g4hzYy#N3J

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_view.png b/res/drawable-xxhdpi/ic_view.png
new file mode 100644
index 0000000000000000000000000000000000000000..36c10e75352646bfb1f6ddbdb24ea2c683cb812e
GIT binary patch
literal 1046
zcmV+x1nK*UP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00WLmL_t(&-tC#&OH@%5hsSZ!moDC;e;|+wEW<_&BJ4&F
zB0)C_skEllQmhX_5eX5xP)I>^FEN67@WIIcAS`+a!-_;5D>L6hv<EeFdXT}h$2n*1
z<C&45!+QO#HQ(&B_FC(#<H7T9na2fkfm|RL$OUqN{%fEN@+l=i9gQ?nM}Shckg?oA
zNo=N`E=CBO*a%(JlSfkGf&AQN%oHTr#<)d6qJUB<=Yuwi(fT+^N_>HQoa4umU?Mh3
z0AIX-_R#MLCSsr2<s2xT_PD@A>?!F^fC~8<SDY|mzOZenK<D`_1fQmhD*R-VLJHaV
zspbVUg4Yb^>;rje6T<$aiOiV3Su`^)cwaZGQD!(DLcr%_TR!Zy1ceAs@ah72g+!hu
zpj9lYn6-@aDAp;(3UoujIiOuk4+=<EbbtcFQ3q_bf=VG;xdc=o+>z&t8ts0b5n_gE
zhUj45BBY>jPxGyS)({eImYT{Nc)LjRhTN$1w!U!#tTG3BBph&)qAuoFOw}Yi72Rba
z>RmIS9by^GR8HrYsd7>|r7R&0<|v8<<Q0dDE+u!~T55ZgGkPgRe!ozY7MxCqU8u_N
z6Z=K=UW59As6HMI<l~Fz<Tw1pGf~}cP#1~nP-I$)xE$5!)5aSX64iqSb&f{#Ln_c4
z4Hx4WIwPv5l<`-N{@NMPbfSTd*nDI|qI$sDBl9tAE2%p)hE+RBJw$T!wJ#H$strG}
zPgL(VsB1*^u~>z%PjGsn6g%szd!=Z*g~+`NlabMFJ99$o$TFyNnKV^Su->4|7H0D~
z3eB49ec_)pE9#vlNE7T(bS*;EJLcVfHG`I}<E&Nmx%9+%SnCzdIwmY*_OsGzK-(%*
znBbxTY%lE$GQ|`FJXKP8-a3V9wOJZrD{Qn_*`&65LTAXoCJgxpwQ&yf$1+x{-djhK
zFgearsd+lqIQMj4gFJY7A{=!vD!rp^osc_W9>jikHDB9Z6#|ZPS*c6Ly3-=utT3(i
zUZv;ltj5~lB^M|nhg4F@p@<r~HC7ZAOI^nlXv~pzEyPwQ3#&99#}(%xY0g)A#e9kj
z%*UwrH3v)2WGeXX2<987A`?%%*1{_&qjyO#?>NqiL@mzqX=BvJGWce6uS(3fj!j&m
z)8YmW)5%3PF8{}uH1a6n47D`SKrN>!Ay2wT?)Nem$OUqNTp$<71zJ}73!T{A)j6B<
QDgXcg07*qoM6N<$f&fI*<p2Nx

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/no_network.png b/res/drawable-xxhdpi/no_network.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ffec0dfe5726e7d38247763c9b252cf68829cc2
GIT binary patch
literal 1015
zcmV<T0|@+yP)<h;3K|Lk000e1NJLTq002k;002S=1ONa4UVm7s0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00VDHL_t(&-tC&tZxTTi$6=vTY;B;GAN@^1sKG*0@CVS+
z9}x@1b8mVuHZdkW)SI#Cp*OWvPbQ`@(LckhntJeT)Ppe|OyfaM9=!SW!0s@xv%h9{
z*(S2@#_YcNWac|FZ{EWN*YPq}7pM#57?2x&1Q5jprjS4iDI_q32}BWqAMQ>8^&o^4
z@>oJ0S5>TzCFGDq2wr=D1cZ>rqAG-vEh3E&1gn4qM3F;{3x&2C<`C7!Qg0r>463G4
zXj{cOoZ<tDplB%yZ3Tpl0J$-OCEH+{${N-O6ycOEkChQp2kJ+mV=$6kL?0VSz_iBR
zVwbHU+1yAaoInRuqds{9G*H5!v1uKrm;^NHIE-W?(g>YD7C0B+mVmrib{uE9aSS&X
zeAQ8$D*D@(eZ*0q2y0_ZI);-}+Ntxl?=~64F^)0BktMp#D<2(R+qTD5OvBFzZ?Y)2
z#+2=^^w}cr40=>zbB)tJZ1JvLL)2_cea2FpV2kf8Hn4*oY#?JKVzf@&VJe!qiO-;)
zkGLVfF0p~U76oZ(;&B*n!Fpb|PpHydp2VtYoC;Y#qxcG?=SyoSt1PdOX>rHNc)y3*
z^9~+;*Pw*S_~wM@XN&6mCmv!Q>)69D>eo%Z_p+R+t4_m*2S=piHyEO3;E??Oy*Wne
zKpvF2fl{K671Hey0xjML@q@H2>%B_zi+e=$uuVF>EA!rL+tz=#Kg}s_>BjYpbh;q(
zT_$Y@MzSAqE+9!QL5zteKhG`^pclr{F>@S1dQPz01ZdY75RbUynqIy5K!8?^CanCp
zVh|{&>GLVU`P9rC=?@Hs42rv|k(_!$aQ@;lUygB#bK$e>F||)`@h3fJ4Q7Cpa<O|9
z&OI|(SOE)$kYY?Pn-tEj*|e}Rao41rM$5$iAvh1LNSqHE5O*DevhNQF&MVfG@?_g%
zCZ^1X-(+o_wXU>~)rB+5__9RC=g`Vphk$uaoO$Lxbe#Y_vbOlri;6}(-OK#$76H0r
zbu}ocB5szL8&<%+XhrMmWs{0PlTH=zGEAJTa}`AaB^gdhZz0N_5~r_C+!gp#-`~eK
z(eB$-a}8jPx{C!h-hN3|*>n4fz~cmHLi62@0J$(DrlnlR1;~veO1di19RhN}ry*v^
linu0Pq5IE<F3^7h^bhG4X-TyR($oL|002ovPDHLkV1j$$$e{oL

literal 0
HcmV?d00001

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 6b9ce79f..45d821cc 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -40,7 +40,6 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
             android:layout_marginTop="10dp"
-            android:background="@color/login_logo_background_color"
             android:src="@drawable/logo"
             android:contentDescription="@string/app_name"/>
 
@@ -63,6 +62,8 @@
             android:text="@string/auth_expired_basic_auth_toast"
             android:visibility="gone"
             android:layout_marginBottom="10dp"
+            android:textColor="#AAAAAA"
+            android:textColorHint="#AAAAAA"
             android:contentDescription="@string/auth_expired_basic_auth_toast"/>
 
 	    <FrameLayout 
@@ -80,6 +81,8 @@
 				android:inputType="textUri"
 				android:drawablePadding="5dp"
 				android:paddingRight="55dp"
+                android:textColor="#AAAAAA"
+                android:textColorHint="#AAAAAA"
 				android:contentDescription="@string/auth_host_address"
                 >
 				<requestFocus />
@@ -108,6 +111,8 @@
             android:drawableLeft="@android:drawable/stat_notify_sync"
             android:drawablePadding="5dp"
             android:gravity="center_vertical"
+            android:textColor="#AAAAAA"
+            android:textColorHint="#AAAAAA"
             android:text="@string/auth_testing_connection"
             android:contentDescription="@string/auth_testing_connection"/>
 
@@ -119,6 +124,8 @@
             android:onClick="onCheckClick"
             android:text="@string/oauth_check_onoff"
             android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="#AAAAAA"
+            android:textColorHint="#AAAAAA"
             android:contentDescription="@string/oauth_check_onoff"
             />
 
@@ -128,6 +135,8 @@
             android:layout_height="wrap_content"
             android:ems="10"
 			android:enabled="false"
+            android:textColor="#AAAAAA"
+            android:textColorHint="#AAAAAA"
             android:text="@string/oauth2_url_endpoint_auth"
             android:singleLine="true"
             android:inputType="textUri"
@@ -143,6 +152,8 @@
             android:text="@string/oauth2_url_endpoint_access"
             android:singleLine="true"
             android:inputType="textUri"
+            android:textColor="#AAAAAA"
+            android:textColorHint="#AAAAAA"
             android:visibility="gone"/>
 
         <EditText
@@ -152,6 +163,8 @@
             android:ems="10"
             android:hint="@string/auth_username"
             android:inputType="textNoSuggestions"
+            android:textColor="#AAAAAA"
+            android:textColorHint="#AAAAAA"
             android:contentDescription="@string/auth_username"
             />
 
@@ -163,6 +176,8 @@
 		    android:ems="10"
 		    android:hint="@string/auth_password"
 		    android:inputType="textPassword"
+            android:textColor="#AAAAAA"
+            android:textColorHint="#AAAAAA"
 		    android:contentDescription="@string/auth_password"
             />
         
@@ -175,6 +190,8 @@
             android:drawablePadding="5dp"
             android:gravity="center_vertical"
             android:text="@string/auth_unauthorized"
+            android:textColor="#AAAAAA"
+            android:textColorHint="#AAAAAA"
             android:contentDescription="@string/auth_unauthorized"/>
 
         <Button
@@ -196,7 +213,8 @@
             android:paddingBottom="5dp"
             android:paddingTop="5dp"
             android:text="@string/auth_register"
-            android:textColor="#0000FF"
+            android:textColor="#AAAAAA"
+            android:textColorHint="#AAAAAA"
             android:contentDescription="@string/auth_register"/>
 
     </LinearLayout>
diff --git a/res/layout/drawer.xml b/res/layout/drawer.xml
index 07ad5ee0..2c54ad15 100644
--- a/res/layout/drawer.xml
+++ b/res/layout/drawer.xml
@@ -16,51 +16,69 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/left_drawer"
-    android:layout_width="240dp"
-    android:layout_height="match_parent"
-    android:layout_gravity="start"
-    android:background="@color/background_color"
-    android:baselineAligned="false"
-    android:clickable="true"
-    android:orientation="vertical"
-    android:fitsSystemWindows="true">
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <RelativeLayout
+        android:id="@+id/left_drawer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:fitsSystemWindows="true"
+        android:background="@color/background_color"
+        >
 
-    <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
-    <!--<LinearLayout-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_margin="5dp">-->
+        <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
+        <!--<LinearLayout-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:layout_margin="5dp">-->
 
-        <!--<ImageView-->
-            <!--android:id="@+id/drawer_userIcon"-->
-            <!--android:layout_width="40dp"-->
-            <!--android:layout_height="40dp"-->
-            <!--android:src="@drawable/abc_ab_bottom_solid_dark_holo" />-->
+            <!--<ImageView-->
+                <!--android:id="@+id/drawer_userIcon"-->
+                <!--android:layout_width="40dp"-->
+                <!--android:layout_height="40dp"-->
+                <!--android:src="@drawable/abc_ab_bottom_solid_dark_holo" />-->
 
-        <!--<TextView-->
-            <!--android:id="@+id/drawer_username"-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:layout_gravity="center_vertical"-->
-            <!--android:layout_marginLeft="5dp"-->
-            <!--android:layout_marginStart="5dp"-->
-            <!--android:textAppearance="?android:attr/textAppearanceLarge" />-->
+            <!--<TextView-->
+                <!--android:id="@+id/drawer_username"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_gravity="center_vertical"-->
+                <!--android:layout_marginLeft="5dp"-->
+                <!--android:layout_marginStart="5dp"-->
+                <!--android:textAppearance="?android:attr/textAppearanceLarge" />-->
 
-    <!--</LinearLayout>-->
+        <!--</LinearLayout>-->
 
-    <!--<TextView-->
-        <!--android:layout_width="fill_parent"-->
-        <!--android:layout_height="2dip"-->
-        <!--android:background="@color/list_item_lastmod_and_filesize_text" />-->
+        <!--<TextView-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="2dip"-->
+            <!--android:background="@color/list_item_lastmod_and_filesize_text" />-->
 
-    <ListView
-        android:id="@+id/drawer_list"
-        android:layout_width="fill_parent"
-        android:layout_height="match_parent"
-        android:background="@color/background_color"
-        android:choiceMode="singleChoice"
-        />
-</LinearLayout>
\ No newline at end of file
+        <ListView
+            android:id="@+id/drawer_list"
+            android:choiceMode="singleChoice"
+            android:layout_width="fill_parent"
+            android:layout_height="match_parent"
+            android:background="@color/background_color"
+            android:divider="#eee"
+            android:dividerHeight="1dp"
+            android:paddingTop="100dp" />
+
+        <TextView
+            android:id="@+id/tv_header"
+            android:layout_width="fill_parent"
+            android:layout_height="100dp"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true"
+            android:background="@color/owncloud_blue"
+            android:gravity="bottom"
+            android:orientation="vertical"
+            android:text="@string/app_name"
+            android:textColor="#FFF"
+            android:textStyle="bold"
+            android:padding="10dp"
+            android:textSize="24sp" />
+    </RelativeLayout>
+</merge>
\ No newline at end of file
diff --git a/res/layout/drawer_list_item.xml b/res/layout/drawer_list_item.xml
index 30f3843b..9b6c1821 100644
--- a/res/layout/drawer_list_item.xml
+++ b/res/layout/drawer_list_item.xml
@@ -24,19 +24,28 @@
     android:layout_alignParentLeft="true"
     android:orientation="horizontal"
     android:background="@color/background_color"
-    android:layout_marginTop="10dp"
-    android:layout_marginBottom="10dp">
+    android:layout_marginTop="16dp"
+    android:layout_marginBottom="16dp"
+    android:minHeight="?android:attr/listPreferredItemHeight">
+
+    <ImageView
+        android:id="@+id/itemIcon"
+        android:layout_width="24sp"
+        android:layout_height="24sp"
+        android:layout_marginLeft="16sp"
+        android:layout_gravity="center_vertical"
+        />
 
     <TextView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/itemTitle"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
+        android:layout_height="wrap_content"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
-        android:textColor="@color/textColor"
+        android:textColor="@color/drawerMenuTextColor"
         android:text="@string/app_name"
-        android:textAppearance="?android:attr/textAppearanceListItemSmall"
-        android:minHeight="?android:attr/listPreferredItemHeightSmall"/>
+        android:layout_gravity="center_vertical"
+        android:textAppearance="?android:attr/textAppearanceListItem"
+        />
 </LinearLayout>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index b42538fd..633ff241 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -24,6 +24,15 @@
     <color name="list_item_lastmod_and_filesize_text">#989898</color>
     <color name="black">#000000</color>
     <color name="textColor">#303030</color>
+    <color name="drawerMenuTextColor">#757575</color>
     <color name="list_divider_background">#fff0f0f0</color>
-    
+    <color name="owncloud_blue">#1D2D44</color>
+    <color name="login_text_color">#AAAAAA</color>
+
+    <!-- Colors -->
+    <color name="color_accent">@color/owncloud_blue_bright</color>
+
+    <!-- standard material color definitions -->
+    <color name="primary">@color/owncloud_blue</color>
+    <color name="primary_dark">#162233</color>
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 22cf669d..44346d38 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -28,6 +28,7 @@
     <string name="drawer_item_settings">Settings</string>
     <string name="drawer_item_logs">Logs</string>
 	<string name="drawer_close">Close</string>
+    <string name="drawer_open">Open</string>
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">More</string>
     <string name="prefs_accounts">Accounts</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0d3f14df..de8a0ab9 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -25,10 +25,18 @@
     	<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
     	<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
     	<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
+		<item name="colorPrimary">@color/primary</item>
+		<item name="colorPrimaryDark">@color/primary_dark</item>
+		<item name="colorAccent">@color/color_accent</item>
 	</style>
 	
-	<style name="Theme.ownCloud.noActionBar" parent="style/Theme.AppCompat.Light">
-        <item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
+	<style name="Theme.ownCloud.noActionBar" parent="style/Theme.AppCompat.Light.DarkActionBar">
+		<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
+		<item name="windowNoTitle">true</item>
+		<item name="windowActionBar">false</item>
+		<item name="colorPrimary">@color/primary</item>
+		<item name="colorPrimaryDark">@color/primary_dark</item>
+		<item name="colorAccent">@color/color_accent</item>
     </style>
 
 	<style name="Theme.ownCloud.Fullscreen" parent="style/Theme.AppCompat">
@@ -38,7 +46,7 @@
 	
 	<style name="Theme.ownCloud.Widget.ActionBar"
 		parent="style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
-    	<item name="android:background">@drawable/main_header_bg</item>
+    	<item name="android:background">@color/owncloud_blue</item>
     	<item name="background">@drawable/main_header_bg</item>
     	<item name="android:textColor">#ffffff</item>
     	<item name="android:shadowColor">#222222</item>
diff --git a/src/com/owncloud/android/ui/NavigationDrawerItem.java b/src/com/owncloud/android/ui/NavigationDrawerItem.java
index 44ed3ecc..0dad197d 100644
--- a/src/com/owncloud/android/ui/NavigationDrawerItem.java
+++ b/src/com/owncloud/android/ui/NavigationDrawerItem.java
@@ -24,6 +24,7 @@ public class NavigationDrawerItem {
 
     private String mTitle;
     private String mContentDescription;
+    private int mIcon;
 
     // Constructors
     public NavigationDrawerItem(){}
@@ -32,9 +33,10 @@ public class NavigationDrawerItem {
         mTitle = title;
     }
 
-    public NavigationDrawerItem(String title, String contentDescription){
+    public NavigationDrawerItem(String title, String contentDescription, int icon){
         mTitle = title;
         mContentDescription = contentDescription;
+        mIcon = icon;
     }
 
     // Getters and Setters
@@ -53,4 +55,12 @@ public class NavigationDrawerItem {
     public void setContentDescription(String contentDescription) {
         this.mContentDescription = contentDescription;
     }
+
+    public int getIcon() {
+        return mIcon;
+    }
+
+    public void setIcon(int icon) {
+        this.mIcon = icon;
+    }
 }
diff --git a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
index fa3eea6f..aef1de1d 100644
--- a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
+++ b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
@@ -22,17 +22,15 @@
 
 package com.owncloud.android.ui.activity;
 
+import android.content.Intent;
+import android.os.Bundle;
+
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.dialog.ConflictsResolveDialog;
 import com.owncloud.android.ui.dialog.ConflictsResolveDialog.Decision;
 import com.owncloud.android.ui.dialog.ConflictsResolveDialog.OnConflictDecisionMadeListener;
-import com.owncloud.android.utils.DisplayUtils;
-
-import android.app.ActionBar;
-import android.content.Intent;
-import android.os.Bundle;
 
 /**
  * Wrapper activity which will be launched if keep-in-sync file will be modified by external
@@ -45,8 +43,6 @@ public class ConflictsResolveActivity extends FileActivity implements OnConflict
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ActionBar actionBar = getActionBar();
-        actionBar.setIcon(DisplayUtils.getSeasonalIconId());
     }
 
     @Override
diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java
index b38e77b8..516daa15 100644
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@ -35,18 +35,18 @@ import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
-import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.AdapterView;
-import android.widget.LinearLayout;
 import android.widget.ListView;
+import android.widget.RelativeLayout;
 import android.widget.Toast;
 
 import com.owncloud.android.BuildConfig;
@@ -76,8 +76,6 @@ import com.owncloud.android.ui.NavigationDrawerItem;
 import com.owncloud.android.ui.adapter.NavigationDrawerListAdapter;
 import com.owncloud.android.ui.dialog.LoadingDialog;
 import com.owncloud.android.ui.dialog.SharePasswordDialogFragment;
-import com.owncloud.android.ui.fragment.FileDetailFragment;
-import com.owncloud.android.ui.fragment.FileFragment;
 import com.owncloud.android.utils.ErrorMessageAdapter;
 
 import java.util.ArrayList;
@@ -87,7 +85,7 @@ import java.util.ArrayList;
  * Activity with common behaviour for activities handling {@link OCFile}s in ownCloud
  * {@link Account}s .
  */
-public class FileActivity extends ActionBarActivity
+public class FileActivity extends AppCompatActivity
         implements OnRemoteOperationListener, ComponentsGetter {
 
     public static final String EXTRA_FILE = "com.owncloud.android.ui.activity.FILE";
@@ -313,7 +311,7 @@ public class FileActivity extends ActionBarActivity
 
         mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
         // Notification Drawer
-        LinearLayout navigationDrawerLayout = (LinearLayout) findViewById(R.id.left_drawer);
+        RelativeLayout navigationDrawerLayout = (RelativeLayout) findViewById(R.id.left_drawer);
         mDrawerList = (ListView) navigationDrawerLayout.findViewById(R.id.drawer_list);
 
         // TODO re-enable when "Accounts" is available in Navigation Drawer
@@ -346,7 +344,8 @@ public class FileActivity extends ActionBarActivity
         // mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[0],
         // mDrawerContentDescriptions[0]));
         // All Files
-        mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[0], mDrawerContentDescriptions[0]));
+        mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[0], mDrawerContentDescriptions[0],
+                R.drawable.ic_folder_open));
 
         // TODO Enable when "On Device" is recovered
         // On Device
@@ -354,11 +353,12 @@ public class FileActivity extends ActionBarActivity
         //        mDrawerContentDescriptions[2]));
 
         // Settings
-        mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[1], mDrawerContentDescriptions[1]));
+        mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[1], mDrawerContentDescriptions[1],
+                R.drawable.ic_settings));
         // Logs
         if (BuildConfig.DEBUG) {
             mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[2],
-                    mDrawerContentDescriptions[2]));
+                    mDrawerContentDescriptions[2],R.drawable.ic_log));
         }
 
         // setting the nav drawer list adapter
@@ -366,12 +366,15 @@ public class FileActivity extends ActionBarActivity
                 mDrawerItems);
         mDrawerList.setAdapter(mNavigationDrawerAdapter);
 
-        mDrawerToggle = new ActionBarDrawerToggle(
-                this,
-                mDrawerLayout,
-                R.drawable.ic_drawer,
-                R.string.app_name,
-                R.string.drawer_close) {
+
+        mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout,R.string.drawer_open,R.string.drawer_close) {
+
+            //new ActionBarDrawerToggle(
+            //this,
+            //  mDrawerLayout,
+            //  R.drawable.ic_drawer,
+            //  R.string.app_name,
+            //  R.string.drawer_close) {
 
             /** Called when a drawer has settled in a completely closed state. */
             public void onDrawerClosed(View view) {
@@ -395,6 +398,7 @@ public class FileActivity extends ActionBarActivity
 
         // Set the drawer toggle as the DrawerListener
         mDrawerLayout.setDrawerListener(mDrawerToggle);
+
     }
 
     /**
diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index cfeb5415..f7d28bd9 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -196,9 +196,15 @@ public class FileDisplayActivity extends HookActivity
                                                                 // according to the official
                                                                 // documentation
 
+        // enable ActionBar app icon to behave as action to toggle nav drawer
+        //getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setHomeButtonEnabled(true);
+
         setSupportProgressBarIndeterminateVisibility(mSyncInProgress
         /*|| mRefreshSharesInProgress*/);
         // always AFTER setContentView(...) ; to work around bug in its implementation
+
+        initDrawer();
         
         setBackgroundText();
 
@@ -209,7 +215,6 @@ public class FileDisplayActivity extends HookActivity
     protected void onStart() {
         Log_OC.v(TAG, "onStart() start");
         super.onStart();
-        getSupportActionBar().setIcon(DisplayUtils.getSeasonalIconId());
         Log_OC.v(TAG, "onStart() end");
     }
 
@@ -1028,7 +1033,9 @@ public class FileDisplayActivity extends HookActivity
                         startImagePreview(getFile());
                     } // TODO what about other kind of previews?
                 }
-                
+
+                setSupportProgressBarIndeterminate(false);
+
             } finally {
                 if (intent != null) {
                     removeStickyBroadcast(intent);
@@ -1166,7 +1173,6 @@ public class FileDisplayActivity extends HookActivity
 
     }
 
-
     @Override
     protected ServiceConnection newTransferenceServiceConnection() {
         return new ListServiceConnection();
diff --git a/src/com/owncloud/android/ui/activity/FolderPickerActivity.java b/src/com/owncloud/android/ui/activity/FolderPickerActivity.java
index a358f79e..df067f0a 100644
--- a/src/com/owncloud/android/ui/activity/FolderPickerActivity.java
+++ b/src/com/owncloud/android/ui/activity/FolderPickerActivity.java
@@ -59,7 +59,6 @@ import com.owncloud.android.syncadapter.FileSyncAdapter;
 import com.owncloud.android.ui.dialog.CreateFolderDialogFragment;
 import com.owncloud.android.ui.fragment.FileFragment;
 import com.owncloud.android.ui.fragment.OCFileListFragment;
-import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.ErrorMessageAdapter;
 
 public class FolderPickerActivity extends FileActivity implements FileFragment.ContainerActivity, 
@@ -116,7 +115,6 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
     @Override
     protected void onStart() {
         super.onStart();
-        getSupportActionBar().setIcon(DisplayUtils.getSeasonalIconId());
     }
 
     /**
diff --git a/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java b/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
index fab638d2..28e13233 100644
--- a/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
+++ b/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
@@ -81,9 +81,6 @@ public class GenericExplanationActivity  extends ActionBarActivity {
         } else {
             listView.setVisibility(View.GONE);
         }
-        
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setIcon(DisplayUtils.getSeasonalIconId());
     }
     
     public class ExplanationListAdapterView extends ArrayAdapter<String> {
diff --git a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
index 71b9d571..96e3c79e 100644
--- a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
+++ b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
@@ -72,9 +72,7 @@ public class LogHistoryActivity extends ActionBarActivity {
 
         setContentView(R.layout.log_send_file);
         setTitle(getText(R.string.actionbar_logger));
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setIcon(DisplayUtils.getSeasonalIconId());
-        actionBar.setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         Button deleteHistoryButton = (Button) findViewById(R.id.deleteLogHistoryButton);
         Button sendHistoryButton = (Button) findViewById(R.id.sendLogHistoryButton);
         TextView logTV = (TextView) findViewById(R.id.logTV);
diff --git a/src/com/owncloud/android/ui/activity/PassCodeActivity.java b/src/com/owncloud/android/ui/activity/PassCodeActivity.java
index 09a96307..39727dcd 100644
--- a/src/com/owncloud/android/ui/activity/PassCodeActivity.java
+++ b/src/com/owncloud/android/ui/activity/PassCodeActivity.java
@@ -128,9 +128,6 @@ public class PassCodeActivity extends ActionBarActivity {
         }
 
         setTextListeners();
-        
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setIcon(DisplayUtils.getSeasonalIconId());
     }
 
 
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index ca7f8871..f0e7d854 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -32,8 +32,8 @@ import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Configuration;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -44,13 +44,18 @@ import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceManager;
-//import android.support.v7.app.ActionBar;
-import android.app.ActionBar;
+import android.support.annotation.LayoutRes;
+import android.support.annotation.Nullable;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatDelegate;
+import android.support.v7.widget.Toolbar;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemLongClickListener;
 import android.widget.ListAdapter;
@@ -75,6 +80,9 @@ import com.owncloud.android.utils.DisplayUtils;
 
 /**
  * An Activity that allows the user to change the application's settings.
+ *
+ * It proxies the necessary calls via {@link android.support.v7.app.AppCompatDelegate} to be used
+ * with AppCompat.
  */
 public class Preferences extends PreferenceActivity
         implements AccountManagerCallback<Boolean>, ComponentsGetter {
@@ -87,6 +95,7 @@ public class Preferences extends PreferenceActivity
     private DbHandler mDbHandler;
     private CheckBoxPreference pCode;
     private Preference pAboutApp;
+    private AppCompatDelegate mDelegate;
 
     private PreferenceCategory mAccountsPrefCategory = null;
     private final Handler mHandler = new Handler();
@@ -109,23 +118,15 @@ public class Preferences extends PreferenceActivity
     @SuppressWarnings("deprecation")
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        getDelegate().installViewFactory();
+        getDelegate().onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
         mDbHandler = new DbHandler(getBaseContext());
         addPreferencesFromResource(R.xml.preferences);
 
-        // Set properties of Action Bar in an ugly workaround to build correctly without
-        // upgrading minSdk
-        // TODO : increase minSdk; scheduled for next realease, don't wont to mix with this US
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            ActionBar actionBar = getActionBar();
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-                actionBar.setIcon(DisplayUtils.getSeasonalIconId());
-            }
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setTitle(R.string.actionbar_settings);
-        } else {
-            setTitle(R.string.actionbar_settings);
-        }
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setTitle(R.string.actionbar_settings);
 
         // For adding content description tag to a title field in the action bar
         int actionBarTitleId = getResources().getIdentifier("action_bar_title", "id", "android");
@@ -571,6 +572,61 @@ public class Preferences extends PreferenceActivity
         }
     }
 
+    public ActionBar getSupportActionBar() {
+        return getDelegate().getSupportActionBar();
+    }
+
+    public void setSupportActionBar(@Nullable Toolbar toolbar) {
+        getDelegate().setSupportActionBar(toolbar);
+    }
+
+    @Override
+    public MenuInflater getMenuInflater() {
+        return getDelegate().getMenuInflater();
+    }
+
+    @Override
+    public void setContentView(@LayoutRes int layoutResID) {
+        getDelegate().setContentView(layoutResID);
+    }
+    @Override
+    public void setContentView(View view) {
+        getDelegate().setContentView(view);
+    }
+    @Override
+    public void setContentView(View view, ViewGroup.LayoutParams params) {
+        getDelegate().setContentView(view, params);
+    }
+
+    @Override
+    public void addContentView(View view, ViewGroup.LayoutParams params) {
+        getDelegate().addContentView(view, params);
+    }
+
+    @Override
+    protected void onPostResume() {
+        super.onPostResume();
+        getDelegate().onPostResume();
+    }
+
+    @Override
+    protected void onTitleChanged(CharSequence title, int color) {
+        super.onTitleChanged(title, color);
+        getDelegate().setTitle(title);
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        getDelegate().onConfigurationChanged(newConfig);
+    }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        getDelegate().onPostCreate(savedInstanceState);
+    }
+
     @Override
     protected void onDestroy() {
         mDbHandler.close();
@@ -585,6 +641,24 @@ public class Preferences extends PreferenceActivity
         }
 
         super.onDestroy();
+        getDelegate().onDestroy();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        getDelegate().onStop();
+    }
+
+    public void invalidateOptionsMenu() {
+        getDelegate().invalidateOptionsMenu();
+    }
+
+    private AppCompatDelegate getDelegate() {
+        if (mDelegate == null) {
+            mDelegate = AppCompatDelegate.create(this, null);
+        }
+        return mDelegate;
     }
 
     /**
diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
index 7a7f8e56..1509797e 100644
--- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@ -117,7 +117,6 @@ public class UploadFilesActivity extends FileActivity implements
             
         // Action bar setup
         ActionBar actionBar = getSupportActionBar();
-        actionBar.setIcon(DisplayUtils.getSeasonalIconId());
         actionBar.setHomeButtonEnabled(true);   // mandatory since Android ICS, according to the
                                                 // official documentation
         actionBar.setDisplayHomeAsUpEnabled(mCurrentDir != null && mCurrentDir.getName() != null);
diff --git a/src/com/owncloud/android/ui/activity/Uploader.java b/src/com/owncloud/android/ui/activity/Uploader.java
index f0e06953..3a55cdc5 100644
--- a/src/com/owncloud/android/ui/activity/Uploader.java
+++ b/src/com/owncloud/android/ui/activity/Uploader.java
@@ -146,11 +146,6 @@ public class Uploader extends FileActivity
         if (mAccountSelected) {
             setAccount((Account) savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT));
         }
-
-
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setIcon(DisplayUtils.getSeasonalIconId());
-
     }
 
     @Override
diff --git a/src/com/owncloud/android/ui/adapter/NavigationDrawerListAdapter.java b/src/com/owncloud/android/ui/adapter/NavigationDrawerListAdapter.java
index 78d0693e..a8a60274 100644
--- a/src/com/owncloud/android/ui/adapter/NavigationDrawerListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/NavigationDrawerListAdapter.java
@@ -28,6 +28,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -102,12 +103,18 @@ public class NavigationDrawerListAdapter extends BaseAdapter {
                 NavigationDrawerItem navItem = (NavigationDrawerItem) mAll.get(position);
 
                 View view = inflator.inflate(R.layout.drawer_list_item, null);
-                view.setMinimumHeight(40);
+
                 LinearLayout itemLayout = (LinearLayout) view.findViewById(R.id.itemLayout);
                 itemLayout.setContentDescription(navItem.getContentDescription());
+
                 TextView itemText = (TextView) view.findViewById(R.id.itemTitle);
                 itemText.setText(navItem.getTitle());
 
+                if(navItem.getIcon()!=0) {
+                    ImageView itemImage = (ImageView) view.findViewById(R.id.itemIcon);
+                    itemImage.setImageResource(navItem.getIcon());
+                }
+
                 return view;
             }
             // TODO re-enable when "Accounts" is available in Navigation Drawer
diff --git a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
index d322a8ea..6ddc0e20 100644
--- a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
+++ b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
@@ -28,7 +28,7 @@ import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 
 import com.owncloud.android.R;
 import com.owncloud.android.utils.DisplayUtils;
@@ -91,7 +91,7 @@ public class ConflictsResolveDialog extends DialogFragment {
                    .create();
     }
     
-    public void showDialog(ActionBarActivity activity) {
+    public void showDialog(AppCompatActivity activity) {
         Fragment prev = activity.getSupportFragmentManager().findFragmentByTag("dialog");
         FragmentTransaction ft = activity.getSupportFragmentManager().beginTransaction();
         if (prev != null) {
@@ -102,7 +102,7 @@ public class ConflictsResolveDialog extends DialogFragment {
         this.show(ft, "dialog");
     }
 
-    public void dismissDialog(ActionBarActivity activity) {
+    public void dismissDialog(AppCompatActivity activity) {
         Fragment prev = activity.getSupportFragmentManager().findFragmentByTag(getTag());
         if (prev != null) {
             FragmentTransaction ft = activity.getSupportFragmentManager().beginTransaction();
-- 
2.11.0