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

diff --cc build.gradle
index 817b528,d96997a..1ef8f61
--- 1/build.gradle
--- 2/build.gradle
+++ b/build.gradle
@@@ -20,11 -20,10 +20,11 @@@ repositories 
  
  dependencies {
      compile name: 'touch-image-view'
-     compile 'com.android.support:support-v4:22.2.1'
      compile project(':owncloud-android-library')
+     compile 'com.android.support:support-v4:22.2.1'
      compile 'com.jakewharton:disklrucache:2.0.2'
      compile 'com.android.support:appcompat-v7:22.2.1'
 +    compile 'com.getbase:floatingactionbutton:1.10.1'
  }
  
  android {

diff --cc res/layout/list_fragment.xml
index ac28fcf,7160b32..bd8b12d
--- 1/res/layout/list_fragment.xml
--- 2/res/layout/list_fragment.xml
+++ b/res/layout/list_fragment.xml
@@@ -83,52 -81,4 +85,52 @@@
              </ScrollView>
      </android.support.v4.widget.SwipeRefreshLayout>
  
 -</FrameLayout>
 +</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"
 +        android:visibility="gone">
 +
 +        <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_colorPressed="@color/owncloud_blue"
 +            fab:fab_title=""/>
 +
 +        <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_colorPressed="@color/owncloud_blue"
 +            fab:fab_title=""/>
 +
 +        <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_import"
 +            fab:fab_colorNormal="@color/owncloud_blue_accent"
 +            fab:fab_colorPressed="@color/owncloud_blue"
 +            fab:fab_title=""/>
 +
 +    </com.getbase.floatingactionbutton.FloatingActionsMenu>
- </RelativeLayout>
++</RelativeLayout>

diff --cc res/values/colors.xml
index b3c2d54,a138288..694e231
--- 1/res/values/colors.xml
--- 2/res/values/colors.xml
+++ b/res/values/colors.xml
@@@ -23,16 -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">#f8f8f8</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>

diff --cc res/values/styles.xml
Simple merge

diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Simple merge

diff --cc src/com/owncloud/android/ui/activity/FolderPickerActivity.java
Simple merge

diff --cc src/com/owncloud/android/ui/activity/Uploader.java
Simple merge

diff --cc src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index a863301,066ff0a..036a016
--- 1/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
--- 2/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@@ -58,11 -51,10 +58,11 @@@ import com.owncloud.android.ui.dialog.C
  import com.owncloud.android.ui.dialog.FileActionsDialogFragment;
  import com.owncloud.android.ui.dialog.RemoveFileDialogFragment;
  import com.owncloud.android.ui.dialog.RenameFileDialogFragment;
 +import com.owncloud.android.ui.dialog.UploadSourceDialogFragment;
  import com.owncloud.android.ui.preview.PreviewImageFragment;
  import com.owncloud.android.ui.preview.PreviewMediaFragment;
- import com.owncloud.android.utils.FileStorageUtils;
  import com.owncloud.android.ui.preview.PreviewTextFragment;
+ import com.owncloud.android.utils.FileStorageUtils;
  
  import java.io.File;