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

diff --cc src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
index 42cbf09,8197143..5ca2e98
--- 1/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
--- 2/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
@@@ -80,9 -77,9 +80,9 @@@ public class PreviewImagePagerAdapter e
  
          mAccount = account;
          mStorageManager = storageManager;
-         mImageFiles = mStorageManager.getFolderImages(parentFolder, false);
+         mImageFiles = mStorageManager.getFolderImages(parentFolder, onlyOnDevice);
          
 -        mImageFiles = FileStorageUtils.sortFolder(mImageFiles);
 +        mImageFiles = FileStorageUtils.sortOcFolder(mImageFiles);
          
          mObsoleteFragments = new HashSet<Object>();
          mObsoletePositions = new HashSet<Integer>();