From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 29 Oct 2015 17:38:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/videoBigThumbnails' into beta
X-Git-Tag: beta-20151122~85
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ee25589d707182cdf280cf7730f3c4c94a41d664?ds=inline;hp=-c

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

ee25589d707182cdf280cf7730f3c4c94a41d664
diff --combined src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 5e6b3bbe,cb0bc89f..900d186c
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@@ -154,7 -154,7 +154,7 @@@ public class FileListListAdapter extend
          ViewType viewType;
          if (!mGridMode){
              viewType = ViewType.LIST_ITEM;
-         } else if (file.isImage()){
+         } else if (file.isImage() || file.isVideo()){
              viewType = ViewType.GRID_IMAGE;
          } else {
              viewType = ViewType.GRID_ITEM;
@@@ -194,7 -194,6 +194,7 @@@
              switch (viewType){
                  case LIST_ITEM:
                      TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);
 +                    TextView fileSizeSeparatorV = (TextView) view.findViewById(R.id.file_separator);
                      TextView lastModV = (TextView) view.findViewById(R.id.last_mod);
                      ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
  
@@@ -203,7 -202,6 +203,7 @@@
  
                      checkBoxV.setVisibility(View.GONE);
  
 +                    fileSizeSeparatorV.setVisibility(View.VISIBLE);
                      fileSizeV.setVisibility(View.VISIBLE);
                      fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));
  
@@@ -215,17 -213,16 +215,17 @@@
                              } else {
                                  if (parentList.isItemChecked(position)) {
                                      checkBoxV.setImageResource(
 -                                            android.R.drawable.checkbox_on_background);
 +                                            R.drawable.ic_checkbox_marked);
                                  } else {
                                      checkBoxV.setImageResource(
 -                                            android.R.drawable.checkbox_off_background);
 +                                            R.drawable.ic_checkbox_blank_outline);
                                  }
                                  checkBoxV.setVisibility(View.VISIBLE);
                              }
                          }
  
                      } else { //Folder
 +                        fileSizeSeparatorV.setVisibility(View.INVISIBLE);
                          fileSizeV.setVisibility(View.INVISIBLE);
                      }
  
@@@ -322,7 -319,7 +322,7 @@@
                                      task
                                      );
                              fileIcon.setImageDrawable(asyncDrawable);
 -                            task.execute(file);
 +                            task.execute(file, true);
                          }
                      }
  
@@@ -411,14 -408,15 +411,14 @@@
       *                                  mStorageManager if is different (and not NULL)
       */
      public void swapDirectory(OCFile directory, FileDataStorageManager updatedStorageManager
 -            /*, boolean onlyOnDevice*/) {
 +            , boolean onlyOnDevice) {
          mFile = directory;
          if (updatedStorageManager != null && updatedStorageManager != mStorageManager) {
              mStorageManager = updatedStorageManager;
              mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);
          }
          if (mStorageManager != null) {
 -            // TODO Enable when "On Device" is recovered ?
 -            mFiles = mStorageManager.getFolderContent(mFile/*, onlyOnDevice*/);
 +            mFiles = mStorageManager.getFolderContent(mFile, onlyOnDevice);
              mFilesOrig.clear();
              mFilesOrig.addAll(mFiles);
              
@@@ -489,8 -487,4 +489,8 @@@
      public void setGridMode(boolean gridMode) {
          mGridMode = gridMode;
      }
 +
 +    public boolean isGridMode() {
 +        return mGridMode;
 +    }
  }