From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 8 Sep 2015 11:51:21 +0000 (+0200)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~57
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0ccb092abbb8aae874b7e84c6d31ae95df3c46f3?hp=ed86a0560aeadbbd4289420f9de5654053c09f55

Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
---

diff --git a/SETUP.md b/SETUP.md
index 59a51cab..469a3312 100644
--- a/SETUP.md
+++ b/SETUP.md
@@ -90,6 +90,7 @@ The generated APK file is saved in android/build/outputs/apk as android-debug.ap
 * Choose the projects with the next names under the 'New Project Name' column:
 ** owncloud-android 
 ** android-support-appcompat-v7-exploded-aar
+** com-getbase-floatingactionbutton-1-10-0-exploded-aar
 ** owncloud-android-workaround-accounts	(optional)
 ** ownCloud Android Library
 ** ownCloud Sample Client (optional)
@@ -102,11 +103,12 @@ The generated APK file is saved in android/build/outputs/apk as android-debug.ap
 * If any error persists, clean and build manually the next projects in order:
 ** ownCloud Android Library
 ** android-support-appcompat-v7-exploded-aar
+** com-getbase-floatingactionbutton-1-10-0-exploded-aar
 ** owncloud-android
 * If any error on those projects persists, check the project properties. In the 'Android' section, API Level should be
 ** ownCloud Android Library	-> API level 19
 ** android-support-appcompat-v7-exploded-aa -> API level 22
-** owncloud-android	-> API level 22 ; in this project, two library projects should appear referred in the bottom of the dialog: libs\android-support-appcompat-v7-exploded-aar and owncloud-android-library. Add them if needed.
+** owncloud-android	-> API level 22 ; in this project, three library projects should appear referred in the bottom of the dialog: libs\android-support-appcompat-v7-exploded-aar, ** com-getbase-floatingactionbutton-1-10-0-exploded-aar and owncloud-android-library. Add them if needed.
 * After those actions you should be good to go. HAVE FUN!
 
 
diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt
index 6fd3e5b3..034ecb32 100644
--- a/THIRD_PARTY.txt
+++ b/THIRD_PARTY.txt
@@ -59,4 +59,8 @@ The third party software included and used by this project is:
    modifications com.ortiz.touch.ExtendedViewPager and com.ortiz.touch.TouchImageView classes. 
    See https://github.com/MikeOrtiz/TouchImageView
  
- 
\ No newline at end of file
+ * floatingactionbutton 1.10.0.
+   Copyright (c) 2014 Jerzy Chalupski
+   Licensed under Apache License, Version 2.0.
+   placed at libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar has been exploded by ownCloud Inc.
+   See https://github.com/futuresimple/android-floating-action-button 
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index a0db0184..56ba3462 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,6 +24,7 @@ dependencies {
     compile project(':owncloud-android-library')
     compile 'com.jakewharton:disklrucache:2.0.2'
     compile 'com.android.support:appcompat-v7:22.2.1'
+    compile 'com.getbase:floatingactionbutton:1.10.0'
 }
 
 android {
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/.classpath b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/.classpath
new file mode 100644
index 00000000..7bc01d9a
--- /dev/null
+++ b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/AndroidManifest.xml b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/AndroidManifest.xml
new file mode 100644
index 00000000..8af1444d
--- /dev/null
+++ b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    package="com.getbase.floatingactionbutton"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:versionCode="14"
+    android:versionName="1.10.0" >
+
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="22" />
+
+    <application />
+
+</manifest>
\ No newline at end of file
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/R.txt b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/R.txt
new file mode 100644
index 00000000..c6d56648
--- /dev/null
+++ b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/R.txt
@@ -0,0 +1,55 @@
+int attr fab_addButtonColorNormal 0x7f010009
+int attr fab_addButtonColorPressed 0x7f010008
+int attr fab_addButtonPlusIconColor 0x7f01000b
+int attr fab_addButtonSize 0x7f01000a
+int attr fab_addButtonStrokeVisible 0x7f01000c
+int attr fab_colorDisabled 0x7f010002
+int attr fab_colorNormal 0x7f010003
+int attr fab_colorPressed 0x7f010001
+int attr fab_expandDirection 0x7f01000f
+int attr fab_icon 0x7f010004
+int attr fab_labelStyle 0x7f01000d
+int attr fab_labelsPosition 0x7f01000e
+int attr fab_plusIconColor 0x7f010000
+int attr fab_size 0x7f010005
+int attr fab_stroke_visible 0x7f010007
+int attr fab_title 0x7f010006
+int dimen fab_actions_spacing 0x7f030000
+int dimen fab_icon_size 0x7f030001
+int dimen fab_labels_margin 0x7f030002
+int dimen fab_plus_icon_size 0x7f030003
+int dimen fab_plus_icon_stroke 0x7f030004
+int dimen fab_shadow_offset 0x7f030005
+int dimen fab_shadow_radius 0x7f030006
+int dimen fab_size_mini 0x7f030007
+int dimen fab_size_normal 0x7f030008
+int dimen fab_stroke_width 0x7f030009
+int drawable fab_bg_mini 0x7f020000
+int drawable fab_bg_normal 0x7f020001
+int id down 0x7f040006
+int id fab_expand_menu_button 0x7f040000
+int id fab_label 0x7f040001
+int id left 0x7f040004
+int id mini 0x7f040002
+int id normal 0x7f040003
+int id right 0x7f040005
+int id up 0x7f040007
+int[] styleable AddFloatingActionButton { 0x7f010000 }
+int styleable AddFloatingActionButton_fab_plusIconColor 0
+int[] styleable FloatingActionButton { 0x7f010001, 0x7f010002, 0x7f010003, 0x7f010004, 0x7f010005, 0x7f010006, 0x7f010007 }
+int styleable FloatingActionButton_fab_colorDisabled 1
+int styleable FloatingActionButton_fab_colorNormal 2
+int styleable FloatingActionButton_fab_colorPressed 0
+int styleable FloatingActionButton_fab_icon 3
+int styleable FloatingActionButton_fab_size 4
+int styleable FloatingActionButton_fab_stroke_visible 6
+int styleable FloatingActionButton_fab_title 5
+int[] styleable FloatingActionsMenu { 0x7f010008, 0x7f010009, 0x7f01000a, 0x7f01000b, 0x7f01000c, 0x7f01000d, 0x7f01000e, 0x7f01000f }
+int styleable FloatingActionsMenu_fab_addButtonColorNormal 1
+int styleable FloatingActionsMenu_fab_addButtonColorPressed 0
+int styleable FloatingActionsMenu_fab_addButtonPlusIconColor 3
+int styleable FloatingActionsMenu_fab_addButtonSize 2
+int styleable FloatingActionsMenu_fab_addButtonStrokeVisible 4
+int styleable FloatingActionsMenu_fab_expandDirection 7
+int styleable FloatingActionsMenu_fab_labelStyle 5
+int styleable FloatingActionsMenu_fab_labelsPosition 6
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/aapt/AndroidManifest.xml b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/aapt/AndroidManifest.xml
new file mode 100644
index 00000000..8af1444d
--- /dev/null
+++ b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/aapt/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    package="com.getbase.floatingactionbutton"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:versionCode="14"
+    android:versionName="1.10.0" >
+
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="22" />
+
+    <application />
+
+</manifest>
\ No newline at end of file
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/annotations.zip b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/annotations.zip
new file mode 100644
index 00000000..a41e45e8
Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/annotations.zip differ
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/build.xml b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/build.xml
new file mode 100644
index 00000000..4317fb0c
--- /dev/null
+++ b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="com-getbase-floatingactionbutton-1-10-0-exploded-aar" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/jars/classes.jar b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/jars/classes.jar
new file mode 100644
index 00000000..212b42f3
Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/jars/classes.jar differ
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/libs/classes.jar b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/libs/classes.jar
new file mode 100644
index 00000000..212b42f3
Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/libs/classes.jar differ
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/proguard.txt b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/proguard.txt
new file mode 100644
index 00000000..b5429595
--- /dev/null
+++ b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/proguard.txt
@@ -0,0 +1,5 @@
+# keep getters/setters in RotatingDrawable so that animations can still work.
+-keepclassmembers class com.getbase.floatingactionbutton.FloatingActionsMenu$RotatingDrawable {
+   void set*(***);
+   *** get*();
+}
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/project.properties b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/project.properties
new file mode 100644
index 00000000..362a0a30
--- /dev/null
+++ b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/project.properties
@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-22
+android.library=true
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-hdpi-v4/fab_bg_mini.png b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-hdpi-v4/fab_bg_mini.png
new file mode 100644
index 00000000..4b48351c
Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-hdpi-v4/fab_bg_mini.png differ
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-hdpi-v4/fab_bg_normal.png b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-hdpi-v4/fab_bg_normal.png
new file mode 100644
index 00000000..4daec66d
Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-hdpi-v4/fab_bg_normal.png differ
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-mdpi-v4/fab_bg_mini.png b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-mdpi-v4/fab_bg_mini.png
new file mode 100644
index 00000000..218cf044
Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-mdpi-v4/fab_bg_mini.png differ
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-mdpi-v4/fab_bg_normal.png b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-mdpi-v4/fab_bg_normal.png
new file mode 100644
index 00000000..c157df36
Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-mdpi-v4/fab_bg_normal.png differ
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-xhdpi-v4/fab_bg_mini.png b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-xhdpi-v4/fab_bg_mini.png
new file mode 100644
index 00000000..d56bfe82
Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-xhdpi-v4/fab_bg_mini.png differ
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-xhdpi-v4/fab_bg_normal.png b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-xhdpi-v4/fab_bg_normal.png
new file mode 100644
index 00000000..41614b93
Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-xhdpi-v4/fab_bg_normal.png differ
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-xxhdpi-v4/fab_bg_mini.png b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-xxhdpi-v4/fab_bg_mini.png
new file mode 100644
index 00000000..1cdd2b1d
Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-xxhdpi-v4/fab_bg_mini.png differ
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-xxhdpi-v4/fab_bg_normal.png b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-xxhdpi-v4/fab_bg_normal.png
new file mode 100644
index 00000000..14608fff
Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-xxhdpi-v4/fab_bg_normal.png differ
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-xxxhdpi-v4/fab_bg_mini.png b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-xxxhdpi-v4/fab_bg_mini.png
new file mode 100644
index 00000000..6fea6746
Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-xxxhdpi-v4/fab_bg_mini.png differ
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-xxxhdpi-v4/fab_bg_normal.png b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-xxxhdpi-v4/fab_bg_normal.png
new file mode 100644
index 00000000..0e78ff60
Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/drawable-xxxhdpi-v4/fab_bg_normal.png differ
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/values/values.xml b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/values/values.xml
new file mode 100644
index 00000000..8139c61d
--- /dev/null
+++ b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/res/values/values.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="AddFloatingActionButton"><attr format="color" name="fab_plusIconColor"/></declare-styleable>
+    <declare-styleable name="FloatingActionButton"><attr format="color" name="fab_colorPressed"/><attr format="color" name="fab_colorDisabled"/><attr format="color" name="fab_colorNormal"/><attr format="reference" name="fab_icon"/><attr format="enum" name="fab_size"><enum name="normal" value="0"/><enum name="mini" value="1"/></attr><attr format="string" name="fab_title"/><attr format="boolean" name="fab_stroke_visible"/></declare-styleable>
+    <declare-styleable name="FloatingActionsMenu"><attr format="color" name="fab_addButtonColorPressed"/><attr format="color" name="fab_addButtonColorNormal"/><attr format="enum" name="fab_addButtonSize"><enum name="normal" value="0"/><enum name="mini" value="1"/></attr><attr format="color" name="fab_addButtonPlusIconColor"/><attr format="boolean" name="fab_addButtonStrokeVisible"/><attr format="reference" name="fab_labelStyle"/><attr format="enum" name="fab_labelsPosition"><enum name="left" value="0"/><enum name="right" value="1"/></attr><attr format="enum" name="fab_expandDirection"><enum name="up" value="0"/><enum name="down" value="1"/><enum name="left" value="2"/><enum name="right" value="3"/></attr></declare-styleable>
+    <!-- From: file:/Users/chalup/src/android-floating-action-button/library/src/main/res/values/dimens.xml -->
+    <eat-comment/>
+    <dimen name="fab_actions_spacing">16dp</dimen>
+    <dimen name="fab_icon_size">24dp</dimen>
+    <dimen name="fab_labels_margin">8dp</dimen>
+    <dimen name="fab_plus_icon_size">14dp</dimen>
+    <dimen name="fab_plus_icon_stroke">2dp</dimen>
+    <dimen name="fab_shadow_offset">3dp</dimen>
+    <dimen name="fab_shadow_radius">9dp</dimen>
+    <dimen name="fab_size_mini">40dp</dimen>
+    <dimen name="fab_size_normal">56dp</dimen>
+    <dimen name="fab_stroke_width">1dp</dimen>
+    <!-- From: file:/Users/chalup/src/android-floating-action-button/library/src/main/res/values/ids.xml -->
+    <eat-comment/>
+    <item name="fab_expand_menu_button" type="id"/>
+    <item name="fab_label" type="id"/>
+</resources>
\ No newline at end of file
diff --git a/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/src/.readme b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/src/.readme
new file mode 100644
index 00000000..4bcebad8
--- /dev/null
+++ b/libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar/src/.readme
@@ -0,0 +1,2 @@
+This hidden file is there to ensure there is an src folder.
+Once we support binary library this will go away.
\ No newline at end of file
diff --git a/project.properties b/project.properties
index b7cabddb..f4e0b0de 100644
--- a/project.properties
+++ b/project.properties
@@ -11,3 +11,4 @@
 target=android-22
 android.library.reference.1=owncloud-android-library
 android.library.reference.2=libs/android-support-appcompat-v7-exploded-aar
+android.library.reference.3=libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar
diff --git a/res/drawable-hdpi/file.png b/res/drawable-hdpi/file.png
index b8ee7207..409d2023 100644
Binary files a/res/drawable-hdpi/file.png and b/res/drawable-hdpi/file.png differ
diff --git a/res/drawable-hdpi/file_doc.png b/res/drawable-hdpi/file_doc.png
index 119fc65f..298ebbdf 100644
Binary files a/res/drawable-hdpi/file_doc.png and b/res/drawable-hdpi/file_doc.png differ
diff --git a/res/drawable-hdpi/file_image.png b/res/drawable-hdpi/file_image.png
index 610a5be1..61eb88f1 100644
Binary files a/res/drawable-hdpi/file_image.png and b/res/drawable-hdpi/file_image.png differ
diff --git a/res/drawable-hdpi/file_movie.png b/res/drawable-hdpi/file_movie.png
index a621ffa4..09520e44 100644
Binary files a/res/drawable-hdpi/file_movie.png and b/res/drawable-hdpi/file_movie.png differ
diff --git a/res/drawable-hdpi/file_pdf.png b/res/drawable-hdpi/file_pdf.png
index bd457209..6af2ec27 100644
Binary files a/res/drawable-hdpi/file_pdf.png and b/res/drawable-hdpi/file_pdf.png differ
diff --git a/res/drawable-hdpi/file_ppt.png b/res/drawable-hdpi/file_ppt.png
index 116f2ed8..2927f964 100644
Binary files a/res/drawable-hdpi/file_ppt.png and b/res/drawable-hdpi/file_ppt.png differ
diff --git a/res/drawable-hdpi/file_sound.png b/res/drawable-hdpi/file_sound.png
index 74865dae..2d495b67 100644
Binary files a/res/drawable-hdpi/file_sound.png and b/res/drawable-hdpi/file_sound.png differ
diff --git a/res/drawable-hdpi/file_xls.png b/res/drawable-hdpi/file_xls.png
index 02070a24..f2aaf846 100644
Binary files a/res/drawable-hdpi/file_xls.png and b/res/drawable-hdpi/file_xls.png differ
diff --git a/res/drawable-hdpi/file_zip.png b/res/drawable-hdpi/file_zip.png
index faebd60d..de292fb5 100644
Binary files a/res/drawable-hdpi/file_zip.png and b/res/drawable-hdpi/file_zip.png differ
diff --git a/res/drawable-hdpi/folder_public.png b/res/drawable-hdpi/folder_public.png
index eed64170..55dbdf9d 100644
Binary files a/res/drawable-hdpi/folder_public.png and b/res/drawable-hdpi/folder_public.png differ
diff --git a/res/drawable-hdpi/ic_menu_archive.png b/res/drawable-hdpi/ic_menu_archive.png
index 2b842033..e2359dbd 100644
Binary files a/res/drawable-hdpi/ic_menu_archive.png and b/res/drawable-hdpi/ic_menu_archive.png differ
diff --git a/res/drawable-hdpi/shared_with_me_folder.png b/res/drawable-hdpi/shared_with_me_folder.png
index b26e9788..d312561b 100644
Binary files a/res/drawable-hdpi/shared_with_me_folder.png and b/res/drawable-hdpi/shared_with_me_folder.png differ
diff --git a/res/drawable-ldpi/file.png b/res/drawable-ldpi/file.png
index b669fdf4..74add13f 100644
Binary files a/res/drawable-ldpi/file.png and b/res/drawable-ldpi/file.png differ
diff --git a/res/drawable-ldpi/file_doc.png b/res/drawable-ldpi/file_doc.png
index 0ea07e3b..3bc2f08d 100644
Binary files a/res/drawable-ldpi/file_doc.png and b/res/drawable-ldpi/file_doc.png differ
diff --git a/res/drawable-ldpi/file_image.png b/res/drawable-ldpi/file_image.png
index 1bf20155..8ff5e6c1 100644
Binary files a/res/drawable-ldpi/file_image.png and b/res/drawable-ldpi/file_image.png differ
diff --git a/res/drawable-ldpi/file_movie.png b/res/drawable-ldpi/file_movie.png
index e50c1681..7cc1ecdc 100644
Binary files a/res/drawable-ldpi/file_movie.png and b/res/drawable-ldpi/file_movie.png differ
diff --git a/res/drawable-ldpi/file_pdf.png b/res/drawable-ldpi/file_pdf.png
index a05afdd5..55be82f0 100644
Binary files a/res/drawable-ldpi/file_pdf.png and b/res/drawable-ldpi/file_pdf.png differ
diff --git a/res/drawable-ldpi/file_ppt.png b/res/drawable-ldpi/file_ppt.png
index 11a9cc96..644fb852 100644
Binary files a/res/drawable-ldpi/file_ppt.png and b/res/drawable-ldpi/file_ppt.png differ
diff --git a/res/drawable-mdpi/file.png b/res/drawable-mdpi/file.png
index f988e577..dd3ebad3 100644
Binary files a/res/drawable-mdpi/file.png and b/res/drawable-mdpi/file.png differ
diff --git a/res/drawable-mdpi/file_doc.png b/res/drawable-mdpi/file_doc.png
index b48f73f4..6c51d2dd 100644
Binary files a/res/drawable-mdpi/file_doc.png and b/res/drawable-mdpi/file_doc.png differ
diff --git a/res/drawable-mdpi/file_image.png b/res/drawable-mdpi/file_image.png
index f70eb95b..1d767a5f 100644
Binary files a/res/drawable-mdpi/file_image.png and b/res/drawable-mdpi/file_image.png differ
diff --git a/res/drawable-mdpi/file_movie.png b/res/drawable-mdpi/file_movie.png
index 48090eb1..638f8edf 100644
Binary files a/res/drawable-mdpi/file_movie.png and b/res/drawable-mdpi/file_movie.png differ
diff --git a/res/drawable-mdpi/file_pdf.png b/res/drawable-mdpi/file_pdf.png
index a10127ae..6292ff45 100644
Binary files a/res/drawable-mdpi/file_pdf.png and b/res/drawable-mdpi/file_pdf.png differ
diff --git a/res/drawable-mdpi/file_ppt.png b/res/drawable-mdpi/file_ppt.png
index 9f3b34d7..3a273b1a 100644
Binary files a/res/drawable-mdpi/file_ppt.png and b/res/drawable-mdpi/file_ppt.png differ
diff --git a/res/drawable-mdpi/file_sound.png b/res/drawable-mdpi/file_sound.png
index 6328e2e1..d157087d 100644
Binary files a/res/drawable-mdpi/file_sound.png and b/res/drawable-mdpi/file_sound.png differ
diff --git a/res/drawable-mdpi/file_xls.png b/res/drawable-mdpi/file_xls.png
index 430db590..e4c66164 100644
Binary files a/res/drawable-mdpi/file_xls.png and b/res/drawable-mdpi/file_xls.png differ
diff --git a/res/drawable-mdpi/file_zip.png b/res/drawable-mdpi/file_zip.png
index e587ecdd..f64412d4 100644
Binary files a/res/drawable-mdpi/file_zip.png and b/res/drawable-mdpi/file_zip.png differ
diff --git a/res/drawable-mdpi/folder_public.png b/res/drawable-mdpi/folder_public.png
index a63effe8..09945b62 100644
Binary files a/res/drawable-mdpi/folder_public.png and b/res/drawable-mdpi/folder_public.png differ
diff --git a/res/drawable-mdpi/ic_menu_archive.png b/res/drawable-mdpi/ic_menu_archive.png
index f21a11f4..99529da4 100644
Binary files a/res/drawable-mdpi/ic_menu_archive.png and b/res/drawable-mdpi/ic_menu_archive.png differ
diff --git a/res/drawable-mdpi/shared_with_me_folder.png b/res/drawable-mdpi/shared_with_me_folder.png
index 0c83a320..ed8f860b 100644
Binary files a/res/drawable-mdpi/shared_with_me_folder.png and b/res/drawable-mdpi/shared_with_me_folder.png differ
diff --git a/res/drawable-xhdpi/file.png b/res/drawable-xhdpi/file.png
index d575f47c..77641700 100644
Binary files a/res/drawable-xhdpi/file.png and b/res/drawable-xhdpi/file.png differ
diff --git a/res/drawable-xhdpi/file_doc.png b/res/drawable-xhdpi/file_doc.png
index e0e2ba9b..16cc0f41 100644
Binary files a/res/drawable-xhdpi/file_doc.png and b/res/drawable-xhdpi/file_doc.png differ
diff --git a/res/drawable-xhdpi/file_image.png b/res/drawable-xhdpi/file_image.png
index 72a7a507..078ed8ae 100644
Binary files a/res/drawable-xhdpi/file_image.png and b/res/drawable-xhdpi/file_image.png differ
diff --git a/res/drawable-xhdpi/file_movie.png b/res/drawable-xhdpi/file_movie.png
index d0216d85..9bb6ddfb 100644
Binary files a/res/drawable-xhdpi/file_movie.png and b/res/drawable-xhdpi/file_movie.png differ
diff --git a/res/drawable-xhdpi/file_pdf.png b/res/drawable-xhdpi/file_pdf.png
index 0d44a50a..f8cf9e49 100644
Binary files a/res/drawable-xhdpi/file_pdf.png and b/res/drawable-xhdpi/file_pdf.png differ
diff --git a/res/drawable-xhdpi/file_ppt.png b/res/drawable-xhdpi/file_ppt.png
index c485c14d..e712d08e 100644
Binary files a/res/drawable-xhdpi/file_ppt.png and b/res/drawable-xhdpi/file_ppt.png differ
diff --git a/res/drawable-xhdpi/file_sound.png b/res/drawable-xhdpi/file_sound.png
index e2736a68..f9814c90 100644
Binary files a/res/drawable-xhdpi/file_sound.png and b/res/drawable-xhdpi/file_sound.png differ
diff --git a/res/drawable-xhdpi/file_xls.png b/res/drawable-xhdpi/file_xls.png
index c1a25b98..b5c6ee18 100644
Binary files a/res/drawable-xhdpi/file_xls.png and b/res/drawable-xhdpi/file_xls.png differ
diff --git a/res/drawable-xhdpi/file_zip.png b/res/drawable-xhdpi/file_zip.png
index 08ccee07..a5ee055e 100644
Binary files a/res/drawable-xhdpi/file_zip.png and b/res/drawable-xhdpi/file_zip.png differ
diff --git a/res/drawable-xhdpi/folder_public.png b/res/drawable-xhdpi/folder_public.png
index 49e849d5..4e35b7a1 100644
Binary files a/res/drawable-xhdpi/folder_public.png and b/res/drawable-xhdpi/folder_public.png differ
diff --git a/res/drawable-xhdpi/ic_menu_archive.png b/res/drawable-xhdpi/ic_menu_archive.png
index bf86cb33..a54161c9 100644
Binary files a/res/drawable-xhdpi/ic_menu_archive.png and b/res/drawable-xhdpi/ic_menu_archive.png differ
diff --git a/res/drawable-xhdpi/shared_with_me_folder.png b/res/drawable-xhdpi/shared_with_me_folder.png
index c5af0d7b..1e6fb301 100644
Binary files a/res/drawable-xhdpi/shared_with_me_folder.png and b/res/drawable-xhdpi/shared_with_me_folder.png differ
diff --git a/res/drawable-xxhdpi/file.png b/res/drawable-xxhdpi/file.png
index ddc9d6b9..be54c422 100644
Binary files a/res/drawable-xxhdpi/file.png and b/res/drawable-xxhdpi/file.png differ
diff --git a/res/drawable-xxhdpi/file_doc.png b/res/drawable-xxhdpi/file_doc.png
index 0c7caeb4..6007b378 100644
Binary files a/res/drawable-xxhdpi/file_doc.png and b/res/drawable-xxhdpi/file_doc.png differ
diff --git a/res/drawable-xxhdpi/file_image.png b/res/drawable-xxhdpi/file_image.png
index 239d4a79..671b6bf1 100644
Binary files a/res/drawable-xxhdpi/file_image.png and b/res/drawable-xxhdpi/file_image.png differ
diff --git a/res/drawable-xxhdpi/file_movie.png b/res/drawable-xxhdpi/file_movie.png
index f60eb714..28acf0e5 100644
Binary files a/res/drawable-xxhdpi/file_movie.png and b/res/drawable-xxhdpi/file_movie.png differ
diff --git a/res/drawable-xxhdpi/file_pdf.png b/res/drawable-xxhdpi/file_pdf.png
index d267059a..b3d9274f 100644
Binary files a/res/drawable-xxhdpi/file_pdf.png and b/res/drawable-xxhdpi/file_pdf.png differ
diff --git a/res/drawable-xxhdpi/file_ppt.png b/res/drawable-xxhdpi/file_ppt.png
index 29235684..569feeca 100644
Binary files a/res/drawable-xxhdpi/file_ppt.png and b/res/drawable-xxhdpi/file_ppt.png differ
diff --git a/res/drawable-xxhdpi/file_sound.png b/res/drawable-xxhdpi/file_sound.png
index b364c3bb..63b0d492 100644
Binary files a/res/drawable-xxhdpi/file_sound.png and b/res/drawable-xxhdpi/file_sound.png differ
diff --git a/res/drawable-xxhdpi/file_xls.png b/res/drawable-xxhdpi/file_xls.png
index c800ae4a..9e297ee3 100644
Binary files a/res/drawable-xxhdpi/file_xls.png and b/res/drawable-xxhdpi/file_xls.png differ
diff --git a/res/drawable-xxhdpi/file_zip.png b/res/drawable-xxhdpi/file_zip.png
index 2ce35ba6..2535d7cb 100644
Binary files a/res/drawable-xxhdpi/file_zip.png and b/res/drawable-xxhdpi/file_zip.png differ
diff --git a/res/drawable-xxhdpi/folder_public.png b/res/drawable-xxhdpi/folder_public.png
index ea72b4db..b6755f3e 100644
Binary files a/res/drawable-xxhdpi/folder_public.png and b/res/drawable-xxhdpi/folder_public.png differ
diff --git a/res/drawable-xxhdpi/ic_menu_archive.png b/res/drawable-xxhdpi/ic_menu_archive.png
index 93ee2adf..81e9f7f8 100644
Binary files a/res/drawable-xxhdpi/ic_menu_archive.png and b/res/drawable-xxhdpi/ic_menu_archive.png differ
diff --git a/res/drawable-xxhdpi/shared_with_me_folder.png b/res/drawable-xxhdpi/shared_with_me_folder.png
index 23e23d8f..d0d6ce80 100644
Binary files a/res/drawable-xxhdpi/shared_with_me_folder.png and b/res/drawable-xxhdpi/shared_with_me_folder.png differ
diff --git a/res/drawable/fab_label_background.xml b/res/drawable/fab_label_background.xml
new file mode 100644
index 00000000..4460dab0
--- /dev/null
+++ b/res/drawable/fab_label_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/black_semi_transparent"/>
+    <padding
+        android:left="@dimen/standard_padding"
+        android:top="4dp"
+        android:right="@dimen/standard_padding"
+        android:bottom="4dp"/>
+    <corners
+        android:radius="2dp"/>
+</shape>
\ No newline at end of file
diff --git a/res/layout/list_footer.xml b/res/layout/list_footer.xml
index a5a0e264..964b8453 100644
--- a/res/layout/list_footer.xml
+++ b/res/layout/list_footer.xml
@@ -14,7 +14,7 @@
         android:padding="@dimen/standard_padding"
         android:layout_gravity="center"
         android:gravity="center"
-        android:textColor="@color/setup_text_hint"
+        android:textColor="@color/secondaryTextColor"
         />
 
 </LinearLayout> 
\ No newline at end of file
diff --git a/res/layout/list_fragment.xml b/res/layout/list_fragment.xml
index 81b52100..1ed1c530 100644
--- a/res/layout/list_fragment.xml
+++ b/res/layout/list_fragment.xml
@@ -17,17 +17,21 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:fab="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:fab="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_weight="1" >
+    android:layout_height="match_parent">
 
     <android.support.v4.widget.SwipeRefreshLayout
         android:id="@+id/swipe_containing_list"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" 
-        android:layout_weight="1"
+        android:layout_height="match_parent"
         android:footerDividersEnabled="false"
         android:visibility="visible" >
         
@@ -79,4 +83,51 @@
             </ScrollView>
     </android.support.v4.widget.SwipeRefreshLayout>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
+    <com.getbase.floatingactionbutton.FloatingActionsMenu
+        android:id="@+id/fab_main"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        fab:fab_addButtonColorNormal="@color/owncloud_blue_accent"
+        fab:fab_addButtonColorPressed="@color/owncloud_blue"
+        fab:fab_addButtonPlusIconColor="@color/white"
+        fab:fab_labelStyle="@style/menu_labels_style"
+        android:layout_marginBottom="@dimen/standard_margin"
+        android:layout_marginRight="@dimen/standard_margin"
+        android:layout_marginEnd="@dimen/standard_margin">
+
+        <com.getbase.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab_upload"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            fab:fab_size="mini"
+            fab:fab_icon="@drawable/ic_action_upload"
+            fab:fab_colorNormal="@color/owncloud_blue_accent"
+            fab:fab_title="@string/actionbar_upload"
+            fab:fab_colorPressed="@color/owncloud_blue"/>
+
+        <com.getbase.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab_mkdir"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            fab:fab_size="mini"
+            fab:fab_icon="@drawable/ic_action_create_dir"
+            fab:fab_colorNormal="@color/owncloud_blue_accent"
+            fab:fab_title="@string/actionbar_mkdir"
+            fab:fab_colorPressed="@color/owncloud_blue"/>
+
+        <com.getbase.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab_upload_from_app"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            fab:fab_size="mini"
+            fab:fab_icon="@drawable/ic_action_upload"
+            fab:fab_colorNormal="@color/owncloud_blue_accent"
+            fab:fab_title="Upload from app"
+            fab:fab_colorPressed="@color/owncloud_blue_bright"/>
+
+    </com.getbase.floatingactionbutton.FloatingActionsMenu>
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
index a3918c72..c18aee7a 100644
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@ -81,7 +81,7 @@
                 android:ellipsize="middle"
                 android:singleLine="true"
                 android:text="TextView"
-                android:textColor="#303030"
+                android:textColor="@color/textColor"
                 android:textSize="@dimen/two_line_primary_text_size" />
 
             <LinearLayout
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 8ca0a4e5..a22ca625 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -23,12 +23,16 @@
     <color name="owncloud_blue_accent">#35537A</color>
     <color name="owncloud_blue_bright">#00ddff</color>
 
-    <color name="list_item_lastmod_and_filesize_text">#989898</color>
+    <color name="list_item_lastmod_and_filesize_text">@color/secondaryTextColor</color>
     <color name="black">#000000</color>
     <color name="white">#FFFFFF</color>
-    <color name="textColor">#303030</color>
+    <color name="fab_white">#fafafa</color>
+    <color name="white_pressed">#f1f1f1</color>
+    <color name="half_black">#808080</color>
+    <color name="black_semi_transparent">#B2000000</color>
+    <color name="textColor">@color/black</color>
     <color name="drawerMenuTextColor">#000000</color>
-    <color name="list_divider_background">#fff0f0f0</color>
+    <color name="list_divider_background">#eee</color>
     <color name="filelist_icon_backgorund">#DDDDDD</color>
     <color name="dark_background_text_color">#EEEEEE</color>
     <color name="login_text_color">#757575</color>
@@ -36,6 +40,9 @@
     <color name="primary_button_color">@color/owncloud_blue_accent</color>
     <color name="secondary_button_color">#D6D7D7</color>
     <color name="transparent">#00000000</color>
+    <color name="secondaryTextColor">#a0a0a0</color>
+    <color name="listItemHighlighted">#f8f8f8</color>
+    <color name="highlightTextColor">#55739a</color>
 
     <!-- Colors -->
     <color name="color_accent">@color/owncloud_blue_accent</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7df7639e..f37e4279 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -127,6 +127,11 @@
 		<item name="buttonBarStyle">@style/Theme.ownCloud.Dialog.ButtonBar</item>
 	</style>
 
+	<style name="menu_labels_style">
+		<item name="android:background">@drawable/fab_label_background</item>
+		<item name="android:textColor">@color/fab_white</item>
+	</style>
+
 	<!-- Button Bar hack due to Lollipop bug:
 		https://code.google.com/p/android/issues/detail?id=78302
 	fix see:
diff --git a/setup_env.bat b/setup_env.bat
index 8ccfeee1..4172a943 100644
--- a/setup_env.bat
+++ b/setup_env.bat
@@ -23,6 +23,7 @@ call git submodule init
 call git submodule update
 
 call android.bat update project -p libs/android-support-appcompat-v7-exploded-aar --target android-22
+call android.bat update project -p libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar --target android-22
 call android.bat update lib-project -p owncloud-android-library
 call android.bat update project -p .
 call android.bat update project -p oc_jb_workaround
diff --git a/setup_env.sh b/setup_env.sh
index 76ba2a32..aadbb46c 100755
--- a/setup_env.sh
+++ b/setup_env.sh
@@ -18,6 +18,7 @@ function initForAnt {
 
 	#Prepare project android-support-appcompat-v7 ; JAR file is not enough, includes resources
 	android update lib-project -p libs/android-support-appcompat-v7-exploded-aar --target android-22
+	android update lib-project -p libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar --target android-22
 	
 	#As default it updates the ant scripts
 	android update lib-project -p owncloud-android-library
diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index fa1dd798..85711d78 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -501,9 +501,7 @@ public class FileDisplayActivity extends HookActivity
         boolean retval = true;
         switch (item.getItemId()) {
             case R.id.action_create_dir: {
-                CreateFolderDialogFragment dialog =
-                        CreateFolderDialogFragment.newInstance(getCurrentDir());
-                dialog.show(getSupportFragmentManager(), DIALOG_CREATE_FOLDER);
+                createFolder();
                 break;
             }
 
@@ -565,6 +563,34 @@ public class FileDisplayActivity extends HookActivity
         return retval;
     }
 
+    public void createFolder() {
+        CreateFolderDialogFragment dialog =
+                CreateFolderDialogFragment.newInstance(getCurrentDir());
+        dialog.show(getSupportFragmentManager(), DIALOG_CREATE_FOLDER);
+    }
+
+    public void uploadLocalFilesSelected() {
+        Intent action = new Intent(this, UploadFilesActivity.class);
+        action.putExtra(
+                UploadFilesActivity.EXTRA_ACCOUNT,
+                getAccount()
+        );
+        startActivityForResult(action, ACTION_SELECT_MULTIPLE_FILES);
+    }
+
+    public void uploadFromOtherAppsSelected() {
+        Intent action = new Intent(Intent.ACTION_GET_CONTENT);
+        action = action.setType("*/*").addCategory(Intent.CATEGORY_OPENABLE);
+        //Intent.EXTRA_ALLOW_MULTIPLE is only supported on api level 18+, Jelly Bean
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+            action.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
+        }
+        startActivityForResult(
+                Intent.createChooser(action, getString(R.string.upload_chooser_title)),
+                ACTION_SELECT_CONTENT_FROM_APPS
+        );
+    }
+
     private void startSynchronization() {
         Log_OC.d(TAG, "Got to start sync");
         if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.KITKAT) {
diff --git a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
index 24015d08..2ca2cc3b 100644
--- a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
@@ -36,7 +36,10 @@ import android.widget.GridView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
+import android.widget.Toast;
 
+import com.getbase.floatingactionbutton.FloatingActionButton;
+import com.getbase.floatingactionbutton.FloatingActionsMenu;
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.ExtendedListView;
@@ -64,6 +67,11 @@ public class ExtendedListFragment extends Fragment
     private SwipeRefreshLayout mRefreshGridLayout;
     private SwipeRefreshLayout mRefreshEmptyLayout;
     private TextView mEmptyListMessage;
+
+    private FloatingActionsMenu fabMain;
+    private FloatingActionButton fabUpload;
+    private FloatingActionButton fabMkdir;
+    private FloatingActionButton fabUploadFromApp;
     
     // Save the state of the scroll in browsing
     private ArrayList<Integer> mIndexes;
@@ -96,6 +104,21 @@ public class ExtendedListFragment extends Fragment
         return mCurrentListView;
     }
 
+    public FloatingActionButton getFabUpload() {
+        return fabUpload;
+    }
+
+    public FloatingActionButton getFabUploadFromApp() {
+        return fabUploadFromApp;
+    }
+
+    public FloatingActionButton getFabMkdir() {
+        return fabMkdir;
+    }
+
+    public FloatingActionsMenu getFabMain() {
+        return fabMain;
+    }
 
     protected void switchToGridView() {
         if ((mCurrentListView == mListView)) {
@@ -171,6 +194,11 @@ public class ExtendedListFragment extends Fragment
 
         mCurrentListView = mListView;   // list as default
 
+        fabMain = (FloatingActionsMenu) v.findViewById(R.id.fab_main);
+        fabUpload = (FloatingActionButton) v.findViewById(R.id.fab_upload);
+        fabMkdir = (FloatingActionButton) v.findViewById(R.id.fab_mkdir);
+        fabUploadFromApp = (FloatingActionButton) v.findViewById(R.id.fab_upload_from_app);
+
         return v;
     }
 
@@ -320,6 +348,23 @@ public class ExtendedListFragment extends Fragment
     }
 
     /**
+     * Disables FAB.
+     *
+     * Sets the 'visibility' state of the FAB contained in the fragment.
+     *
+     * When 'false' is set, FAB visibility is set to View.GONE programatically,
+     *
+     * @param   enabled     Desired visibility for the FAB.
+     */
+    public void setFabEnabled(boolean enabled) {
+        if(enabled) {
+            fabMain.setVisibility(View.VISIBLE);
+        } else {
+            fabMain.setVisibility(View.GONE);
+        }
+    }
+
+    /**
      * Set message for empty list view
      */
     public void setMessageForEmptyList(String message) {
diff --git a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
index df5b34aa..5441aead 100644
--- a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
@@ -54,7 +54,6 @@ public class LocalFileListFragment extends ExtendedListFragment {
     /** Adapter to connect the data from the directory with the View object */
     private LocalFileListAdapter mAdapter = null;
 
-    
     /**
      * {@inheritDoc}
      */
@@ -79,6 +78,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
         View v = super.onCreateView(inflater, container, savedInstanceState);
         setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
         setSwipeEnabled(false); // Disable pull-to-refresh
+        setFabEnabled(false); // Disable FAB
         setMessageForEmptyList(getString(R.string.local_file_list_empty));
         Log_OC.i(TAG, "onCreateView() end");
         return v;