Merge remote-tracking branch 'remotes/upstream/material_fab' into beta

diff --cc build.gradle
Simple merge

diff --cc res/menu/main_menu.xml
index e03960f,bd21893..2551a83
--- 1/res/menu/main_menu.xml
--- 2/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@@ -35,16 -28,10 +28,16 @@@
          android:title="@string/actionbar_mkdir"
          android:contentDescription="@string/actionbar_mkdir"/>
      <item
 +        android:id="@+id/action_switch_view"
 +        android:icon="@drawable/ic_view_module"
 +        android:orderInCategory="2"
 +        app:showAsAction="never"
 +        android:title="@string/action_switch_grid_view" />
 +    <item
          android:id="@+id/action_sync_account"
          android:icon="@drawable/ic_action_refresh"
-         android:orderInCategory="2"
-         app:showAsAction="never"
+         android:orderInCategory="1"
+         app:showAsAction="always"
          android:title="@string/actionbar_sync"
          android:contentDescription="@string/actionbar_sync"/>
        <item

diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 37bd66f,aa3c1ef..7b97a9c
--- 1/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
--- 2/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -492,11 -480,8 +487,9 @@@ public class FileDisplayActivity extend
      @Override
      public boolean onPrepareOptionsMenu(Menu menu) {
          boolean drawerOpen = mDrawerLayout.isDrawerOpen(GravityCompat.START);
-         menu.findItem(R.id.action_upload).setVisible(!drawerOpen);
-         menu.findItem(R.id.action_create_dir).setVisible(!drawerOpen);
          menu.findItem(R.id.action_sort).setVisible(!drawerOpen);
          menu.findItem(R.id.action_sync_account).setVisible(!drawerOpen);
 +        menu.findItem(R.id.action_switch_view).setVisible(!drawerOpen);
          
          return super.onPrepareOptionsMenu(menu);
      }
@@@ -505,12 -490,7 +498,13 @@@
      public boolean onCreateOptionsMenu(Menu menu) {
          MenuInflater inflater = getMenuInflater();
          inflater.inflate(R.menu.main_menu, menu);
+         menu.findItem(R.id.action_create_dir).setVisible(false);
 +        mOptionsMenu = menu;
 +
 +        MenuItem menuItem = mOptionsMenu.findItem(R.id.action_switch_view);
 +
 +        changeGridIcon();
 +
          return true;
      }
      
@@@ -829,23 -826,6 +857,20 @@@
                  setFile(listOfFiles.getCurrentFile());
              }
              cleanSecondFragment();
- 
 +            changeGridIcon();
-         } else {
-             super.onBackPressed();
 +        }
 +    }
 +
 +    private void changeGridIcon(){
 +        MenuItem menuItem = mOptionsMenu.findItem(R.id.action_switch_view);
 +        if (DisplayUtils.isGridView(getFile(), getStorageManager())){
 +            menuItem.setTitle(getApplicationContext().getString(R.string.action_switch_list_view));
 +            menuItem.setIcon(ContextCompat.getDrawable(getApplicationContext(),
 +                    R.drawable.ic_view_list));
 +        } else {
 +            menuItem.setTitle(getApplicationContext().getString(R.string.action_switch_grid_view));
 +            menuItem.setIcon(ContextCompat.getDrawable(getApplicationContext(),
 +                    R.drawable.ic_view_module));
          }
      }
  

diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
Simple merge

diff --cc src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
index 1a19e65,900fde9..6d93ab3
--- 1/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
--- 2/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
@@@ -96,8 -106,23 +106,23 @@@ public class ExtendedListFragment exten
          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() {
 +    public void switchToGridView() {
          if ((mCurrentListView == mListView)) {
  
              mListView.setAdapter(null);

diff --cc src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index bfe6ec2,613b5c8..5a40b29
--- 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
@@@ -51,9 -58,9 +58,10 @@@ 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.DisplayUtils;
  import com.owncloud.android.utils.FileStorageUtils;
  import com.owncloud.android.ui.preview.PreviewTextFragment;
  

diff --cc src/com/owncloud/android/utils/DisplayUtils.java
index 374a713,99c465e..f63d7ec
--- 1/src/com/owncloud/android/utils/DisplayUtils.java
--- 2/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@@ -47,9 -35,9 +47,10 @@@ import android.widget.SeekBar
  \r
  import com.owncloud.android.MainApp;\r
  import com.owncloud.android.R;\r
 +import com.owncloud.android.datamodel.FileDataStorageManager;\r
  import com.owncloud.android.datamodel.OCFile;\r
  \r
+ import java.math.BigDecimal;\r
  import java.net.IDN;\r
  import java.text.DateFormat;\r
  import java.util.Calendar;\r