From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Mon, 2 Nov 2015 13:17:31 +0000 (+0100)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into beta
X-Git-Tag: beta-20151122~51
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/37d67265bd60a76f350a9941d8f59cdd82d38603?ds=inline;hp=-c

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

Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
---

37d67265bd60a76f350a9941d8f59cdd82d38603
diff --combined res/layout/list_item.xml
index 754fd9e8,a72bdafa..17b098aa
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@@ -81,7 -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
@@@ -92,10 -92,10 +92,10 @@@
                  android:orientation="horizontal">
  
                  <TextView
-                     android:id="@+id/last_mod"
+                     android:id="@+id/last_size"
                      android:layout_width="wrap_content"
                      android:layout_height="wrap_content"
-                     android:text="TextView"
+                     android:text="Size MB"
                      android:textColor="@color/list_item_lastmod_and_filesize_text"
                      android:textSize="@dimen/two_line_secondary_text_size"/>
  
@@@ -109,11 -109,11 +109,11 @@@
                      android:textSize="@dimen/two_line_secondary_text_size"/>
  
                  <TextView
-                     android:id="@+id/file_size"
+                     android:id="@+id/file_mod"
                      android:layout_width="wrap_content"
                      android:layout_height="wrap_content"
                      android:gravity="right"
-                     android:text="TextView"
+                     android:text="Mod Date"
                      android:textColor="@color/list_item_lastmod_and_filesize_text"
                      android:textSize="@dimen/two_line_secondary_text_size"/>
  
diff --combined res/values-cs-rCZ/strings.xml
index 88f7b5b7,7bf04297..82845668
--- a/res/values-cs-rCZ/strings.xml
+++ b/res/values-cs-rCZ/strings.xml
@@@ -79,6 -79,7 +79,7 @@@
    <string name="filedetails_created">Vytvořen:</string>
    <string name="filedetails_modified">Upraven:</string>
    <string name="filedetails_download">Stáhnout</string>
+   <string name="filedetails_sync_file">Synchronizovat</string>
    <string name="filedetails_renamed_in_upload_msg">Soubor byl v průběhu odesílání přejmenován na %1$s</string>
    <string name="list_layout">Náhled seznamu</string>
    <string name="action_share_file">Sdílet odkaz</string>
@@@ -86,6 -87,7 +87,7 @@@
    <string name="common_yes">Ano</string>
    <string name="common_no">Ne</string>
    <string name="common_ok">OK</string>
+   <string name="common_cancel_sync">Zrušit synchronizaci</string>
    <string name="common_cancel">Zrušit</string>
    <string name="common_save_exit">Uložit a ukončit</string>
    <string name="common_error">Chyba</string>
@@@ -195,11 -197,11 +197,11 @@@
    <string name="unfavorite">Odebrat z oblíbených</string>
    <string name="common_rename">Přejmenovat</string>
    <string name="common_remove">Odstranit</string>
 -  <string name="confirmation_remove_alert">Opravdu chcete odstranit %1$s ?</string>
 +  <string name="confirmation_remove_file_alert">Opravdu chcete odstranit %1$s ?</string>
    <string name="confirmation_remove_folder_alert">Opravdu chcete odstranit %1$s a jeho obsah?</string>
    <string name="confirmation_remove_local">Pouze místní</string>
    <string name="confirmation_remove_folder_local">Pouze místní</string>
 -  <string name="confirmation_remove_remote">Ze serveru</string>
 +  <string name="confirmation_remove_file_remote">Ze serveru</string>
    <string name="confirmation_remove_remote_and_local">Vzdálený &amp; místní</string>
    <string name="remove_success_msg">Úspěšně odstraněno</string>
    <string name="remove_fail_msg">Odstranění nelze dokončit</string>
@@@ -312,6 -314,7 +314,7 @@@ správce systému.</string
    <string name="prefs_category_instant_uploading">Okamžitá odesílání</string>
    <string name="prefs_category_security">Zabezpečení</string>
    <string name="prefs_instant_video_upload_path_title">Cesta pro nahrávání videí</string>
+   <string name="sync_folder_failed_content">Synchronizaci adresáře %1$s nelze dokončit</string>
    <string name="shared_subject_header">sdílené</string>
    <string name="with_you_subject_header">s vámi</string>
    <string name="subject_token">%1$s s vámi sdílí \"%2$s\"</string>
diff --combined res/values-fi-rFI/strings.xml
index 873055e1,59dc4685..1e61d6d2
--- a/res/values-fi-rFI/strings.xml
+++ b/res/values-fi-rFI/strings.xml
@@@ -79,6 -79,7 +79,7 @@@
    <string name="filedetails_created">Luotu:</string>
    <string name="filedetails_modified">Muokattu:</string>
    <string name="filedetails_download">Lataa</string>
+   <string name="filedetails_sync_file">Synkronoi</string>
    <string name="filedetails_renamed_in_upload_msg">Tiedoston nimeksi muutettiin %1$s siirron yhteydessä</string>
    <string name="list_layout">Luettelon asettelu</string>
    <string name="action_share_file">Jaa linkki</string>
@@@ -86,6 -87,7 +87,7 @@@
    <string name="common_yes">Kyllä</string>
    <string name="common_no">Ei</string>
    <string name="common_ok">OK</string>
+   <string name="common_cancel_sync">Peru synkronointi</string>
    <string name="common_cancel">Peru</string>
    <string name="common_save_exit">Tallenna ja poistu</string>
    <string name="common_error">Virhe</string>
@@@ -187,11 -189,11 +189,11 @@@
    <string name="unfavorite">Poista suosikeista</string>
    <string name="common_rename">Nimeä uudelleen</string>
    <string name="common_remove">Poista</string>
 -  <string name="confirmation_remove_alert">Haluatko varmasti poistaa kohteen %1$s?</string>
 +  <string name="confirmation_remove_file_alert">Haluatko varmasti poistaa kohteen %1$s?</string>
    <string name="confirmation_remove_folder_alert">Haluatko varmasti poistaa kohteen %1$s ja sen sisällön?</string>
    <string name="confirmation_remove_local">Vain paikallinen</string>
    <string name="confirmation_remove_folder_local">Vain paikallinen</string>
 -  <string name="confirmation_remove_remote">Palvelimelta</string>
 +  <string name="confirmation_remove_file_remote">Palvelimelta</string>
    <string name="confirmation_remove_remote_and_local">Etä ja paikallinen</string>
    <string name="remove_success_msg">Poistettu onnistuneesti</string>
    <string name="remove_fail_msg">Poistamista ei voitu suorittaa loppuun asti</string>
@@@ -293,6 -295,7 +295,7 @@@
    <string name="copy_file_error">Tätä tiedostoa tai kansiota kopioitaessa tapahtui virhe</string>
    <string name="prefs_category_instant_uploading">Välittömät lähetykset</string>
    <string name="prefs_category_security">Tietoturva</string>
+   <string name="sync_folder_failed_content">Kansion %1$s synkronointia ei voitu suorittaa kokonaan</string>
    <string name="shared_subject_header">jaettu</string>
    <string name="with_you_subject_header">kanssasi</string>
    <string name="subject_token">%1$s jakoi kohteen \"%2$s\" kanssasi</string>
diff --combined res/values-fr/strings.xml
index f8a303ab,0fae7cfc..6bf6d4f4
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@@ -80,6 -80,7 +80,7 @@@ Téléchargez-le ici : %2$s</string
    <string name="filedetails_created">Créé le :</string>
    <string name="filedetails_modified">Modifié le :</string>
    <string name="filedetails_download">Télécharger</string>
+   <string name="filedetails_sync_file">Synchroniser</string>
    <string name="filedetails_renamed_in_upload_msg">Le fichier a été renommé en %s pendant le téléversement</string>
    <string name="list_layout">Affichage en liste</string>
    <string name="action_share_file">Partager le lien</string>
@@@ -87,6 -88,7 +88,7 @@@
    <string name="common_yes">Oui</string>
    <string name="common_no">Non</string>
    <string name="common_ok">OK</string>
+   <string name="common_cancel_sync">Annuler la synchronisation</string>
    <string name="common_cancel">Annuler</string>
    <string name="common_save_exit">Sauvegarder &amp; Quitter</string>
    <string name="common_error">Erreur</string>
@@@ -201,11 -203,11 +203,11 @@@ Ci-dessous la liste des fichiers locaux
    <string name="unfavorite">Retirer des favoris</string>
    <string name="common_rename">Renommer</string>
    <string name="common_remove">Supprimer</string>
 -  <string name="confirmation_remove_alert">Voulez-vous vraiment supprimer %1$s ?</string>
 +  <string name="confirmation_remove_file_alert">Voulez-vous vraiment supprimer %1$s ?</string>
    <string name="confirmation_remove_folder_alert">Voulez-vous vraiment supprimer %1$s et son contenu ?</string>
    <string name="confirmation_remove_local">Local seulement</string>
    <string name="confirmation_remove_folder_local">Local seulement</string>
 -  <string name="confirmation_remove_remote">Depuis le serveur</string>
 +  <string name="confirmation_remove_file_remote">Depuis le serveur</string>
    <string name="confirmation_remove_remote_and_local">Distant &amp; local</string>
    <string name="remove_success_msg">Suppression effectuée avec succès</string>
    <string name="remove_fail_msg">Suppression impossible</string>
@@@ -317,6 -319,7 +319,7 @@@
    <string name="prefs_category_instant_uploading">Téléversement immédiat</string>
    <string name="prefs_category_security">Sécurité</string>
    <string name="prefs_instant_video_upload_path_title">Répertoire de téléversement des vidéos</string>
+   <string name="sync_folder_failed_content">La synchronisation du dossier %1$s n\'a pas pu être terminée</string>
    <string name="shared_subject_header">a partagé</string>
    <string name="with_you_subject_header">avec vous</string>
    <string name="subject_token">%1$s a partagé \"%2$s\" avec vous</string>
diff --combined res/values-it/strings.xml
index 815e82f3,09f47c2d..b1c227ad
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@@ -79,6 -79,7 +79,7 @@@
    <string name="filedetails_created">Creato:</string>
    <string name="filedetails_modified">Modificato:</string>
    <string name="filedetails_download">Scarica</string>
+   <string name="filedetails_sync_file">Sincronizza</string>
    <string name="filedetails_renamed_in_upload_msg">Il file è stato rinominato in %1$s durante il caricamento</string>
    <string name="list_layout">Struttura elenco</string>
    <string name="action_share_file">Condividi collegamento</string>
@@@ -86,6 -87,7 +87,7 @@@
    <string name="common_yes">Sì</string>
    <string name="common_no">No</string>
    <string name="common_ok">OK</string>
+   <string name="common_cancel_sync">Annulla sincronizzazione</string>
    <string name="common_cancel">Annulla</string>
    <string name="common_save_exit">Salva ed esci</string>
    <string name="common_error">Errore</string>
@@@ -196,11 -198,11 +198,11 @@@
    <string name="unfavorite">Rimuovi dai preferiti</string>
    <string name="common_rename">Rinomina</string>
    <string name="common_remove">Rimuovi</string>
 -  <string name="confirmation_remove_alert">Vuoi davvero rimuovere %1$s?</string>
 +  <string name="confirmation_remove_file_alert">Vuoi davvero rimuovere %1$s?</string>
    <string name="confirmation_remove_folder_alert">Vuoi davvero rimuovere %1$s e il suo contenuto?</string>
    <string name="confirmation_remove_local">Solo localmente</string>
    <string name="confirmation_remove_folder_local">Solo locale</string>
 -  <string name="confirmation_remove_remote">Dal server</string>
 +  <string name="confirmation_remove_file_remote">Dal server</string>
    <string name="confirmation_remove_remote_and_local">Remota e locale</string>
    <string name="remove_success_msg">Rimozione effettuata con successo</string>
    <string name="remove_fail_msg">La rimozione non può essere completata</string>
@@@ -313,6 -315,7 +315,7 @@@
    <string name="prefs_category_instant_uploading">Caricamenti istantanei</string>
    <string name="prefs_category_security">Protezione</string>
    <string name="prefs_instant_video_upload_path_title">Percorso di caricamento video</string>
+   <string name="sync_folder_failed_content">La sincronizzazione della cartella %1$s non può essere completata</string>
    <string name="shared_subject_header">condiviso</string>
    <string name="with_you_subject_header">con te</string>
    <string name="subject_token">%1$s ha condiviso \"%2$s\" con te</string>
diff --combined res/values-nl/strings.xml
index 3ff8c607,8214dfdd..8e16089a
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@@ -80,6 -80,7 +80,7 @@@ Download hier: %2$s</string
    <string name="filedetails_created">Aangemaakt:</string>
    <string name="filedetails_modified">Aangepast:</string>
    <string name="filedetails_download">Download</string>
+   <string name="filedetails_sync_file">Synchroniseren</string>
    <string name="filedetails_renamed_in_upload_msg">Bestand is tijdens het uploaden hernoemd naar %1$s</string>
    <string name="list_layout">Lijst layout</string>
    <string name="action_share_file">Deel link</string>
@@@ -87,6 -88,7 +88,7 @@@
    <string name="common_yes">Ja</string>
    <string name="common_no">Nee</string>
    <string name="common_ok">OK</string>
+   <string name="common_cancel_sync">Annuleren synchronisatie</string>
    <string name="common_cancel">Annuleren</string>
    <string name="common_save_exit">Opslaan &amp; Afsluiten</string>
    <string name="common_error">Fout</string>
@@@ -199,11 -201,11 +201,11 @@@ Hieronder staan de lokale bestanden en 
    <string name="unfavorite">Niet meer favoriet</string>
    <string name="common_rename">Hernoemen</string>
    <string name="common_remove">Verwijderen</string>
 -  <string name="confirmation_remove_alert">Wilt u %1$s werkelijk verwijderen?</string>
 +  <string name="confirmation_remove_file_alert">Wilt u %1$s werkelijk verwijderen?</string>
    <string name="confirmation_remove_folder_alert">Wilt u %1$s en de inhoud ervan werkelijk verwijderen?</string>
    <string name="confirmation_remove_local">Alleen lokaal</string>
    <string name="confirmation_remove_folder_local">Alleen lokaal</string>
 -  <string name="confirmation_remove_remote">Van server</string>
 +  <string name="confirmation_remove_file_remote">Van server</string>
    <string name="confirmation_remove_remote_and_local">Extern &amp; lokaal</string>
    <string name="remove_success_msg">Succesvol verwijderd</string>
    <string name="remove_fail_msg">Verwijdering kon niet voltooid worden</string>
@@@ -316,6 -318,7 +318,7 @@@
    <string name="prefs_category_instant_uploading">Directe uploads</string>
    <string name="prefs_category_security">Beveiliging</string>
    <string name="prefs_instant_video_upload_path_title">Upload Video Pad</string>
+   <string name="sync_folder_failed_content">Synchronisatie van map %1$s kon niet worden voltooid</string>
    <string name="shared_subject_header">gedeeld</string>
    <string name="with_you_subject_header">met u</string>
    <string name="subject_token">%1$s deelde \"%2$s\" met u</string>
diff --combined res/values-pt-rBR/strings.xml
index 0e97855e,f2e6f04c..43e87a49
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@@ -79,6 -79,7 +79,7 @@@
    <string name="filedetails_created">Criado:</string>
    <string name="filedetails_modified">Modificado:</string>
    <string name="filedetails_download">Baixar</string>
+   <string name="filedetails_sync_file">Sincronizar</string>
    <string name="filedetails_renamed_in_upload_msg">Arquivo foi renomeado para %1$s durante o envio</string>
    <string name="list_layout">Lista de Layout</string>
    <string name="action_share_file">Compartilhar link</string>
@@@ -86,6 -87,7 +87,7 @@@
    <string name="common_yes">Sim</string>
    <string name="common_no">Não</string>
    <string name="common_ok">OK</string>
+   <string name="common_cancel_sync">Cancelar a sincronização</string>
    <string name="common_cancel">Cancelar</string>
    <string name="common_save_exit">Salvar &amp; Sair</string>
    <string name="common_error">Erro</string>
@@@ -196,11 -198,11 +198,11 @@@
    <string name="unfavorite">Nãofavorito</string>
    <string name="common_rename">Renomear</string>
    <string name="common_remove">Remover</string>
 -  <string name="confirmation_remove_alert">Você realmente deseja remover %1$s?</string>
 +  <string name="confirmation_remove_file_alert">Você realmente deseja remover %1$s?</string>
    <string name="confirmation_remove_folder_alert">Você realmente deseja remover %1$s e seus conteúdos?</string>
    <string name="confirmation_remove_local">Somente local</string>
    <string name="confirmation_remove_folder_local">Somente local</string>
 -  <string name="confirmation_remove_remote">Do servidor</string>
 +  <string name="confirmation_remove_file_remote">Do servidor</string>
    <string name="confirmation_remove_remote_and_local">Remoto &amp; local</string>
    <string name="remove_success_msg">Removido com sucesso</string>
    <string name="remove_fail_msg">Erro ao remover</string>
@@@ -313,6 -315,7 +315,7 @@@
    <string name="prefs_category_instant_uploading">Envios Instantâneos</string>
    <string name="prefs_category_security">Segurança</string>
    <string name="prefs_instant_video_upload_path_title">Enviar o Caminho do Vídeo</string>
+   <string name="sync_folder_failed_content">A sincronização da pasta %1$s não pode ser finalizada</string>
    <string name="shared_subject_header">compartilhado</string>
    <string name="with_you_subject_header">com você</string>
    <string name="subject_token">%1$s compartilhado \"%2$s\" com você</string>
diff --combined res/values-pt-rPT/strings.xml
index 9541e2c6,89f42ac2..8cf3e43d
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@@ -79,6 -79,7 +79,7 @@@
    <string name="filedetails_created">Criado:</string>
    <string name="filedetails_modified">Modificado:</string>
    <string name="filedetails_download">Transferir</string>
+   <string name="filedetails_sync_file">Sincronizar</string>
    <string name="filedetails_renamed_in_upload_msg">O ficheiro foi renomeado para %1$s durante o envio.</string>
    <string name="list_layout">Apresentação da Lista</string>
    <string name="action_share_file">Partilhar a hiperligação</string>
@@@ -86,6 -87,7 +87,7 @@@
    <string name="common_yes">Sim</string>
    <string name="common_no">Não</string>
    <string name="common_ok">ACEITAR</string>
+   <string name="common_cancel_sync">Cancelar sincronização</string>
    <string name="common_cancel">Cancelar</string>
    <string name="common_save_exit">Guardar &amp; Sair</string>
    <string name="common_error">Erro</string>
@@@ -195,11 -197,11 +197,11 @@@
    <string name="unfavorite">Retirar Favorito</string>
    <string name="common_rename">Renomear</string>
    <string name="common_remove">Remover</string>
 -  <string name="confirmation_remove_alert">Tem a certeza que deseja remover %1$s ?</string>
 +  <string name="confirmation_remove_file_alert">Tem a certeza que deseja remover %1$s ?</string>
    <string name="confirmation_remove_folder_alert">Deseja realmente remover %1$s e o seu conteúdo?</string>
    <string name="confirmation_remove_local">Apenas localmente</string>
    <string name="confirmation_remove_folder_local">Apenas localmente</string>
 -  <string name="confirmation_remove_remote">Do servidor</string>
 +  <string name="confirmation_remove_file_remote">Do servidor</string>
    <string name="confirmation_remove_remote_and_local">Remoto &amp; local</string>
    <string name="remove_success_msg">Removido com sucesso</string>
    <string name="remove_fail_msg">Não foi possível remover</string>
@@@ -311,6 -313,7 +313,7 @@@
    <string name="prefs_category_instant_uploading">Envios Instantâneos</string>
    <string name="prefs_category_security">Segurança</string>
    <string name="prefs_instant_video_upload_path_title">Envio do Caminho do Vídeo</string>
+   <string name="sync_folder_failed_content">Não foi possível completar a sincronização da pasta %1$s</string>
    <string name="shared_subject_header">partilhado</string>
    <string name="with_you_subject_header">consigo</string>
    <string name="subject_token">%1$s partilhou \"%2$s\" consigo</string>
diff --combined src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 40372e38,e9e96145..836ecccc
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@@ -25,19 -25,12 +25,19 @@@ package com.owncloud.android.ui.adapter
  
  
  import java.io.File;
 +import java.util.ArrayList;
 +import java.util.HashMap;
 +import java.util.Map;
  import java.util.Vector;
  
  import android.accounts.Account;
  import android.content.Context;
  import android.content.SharedPreferences;
  import android.graphics.Bitmap;
 +import android.graphics.Color;
 +import android.graphics.BitmapFactory;
 +import android.graphics.Canvas;
 +import android.graphics.Paint;
  import android.os.Build;
  import android.preference.PreferenceManager;
  import android.text.format.DateUtils;
@@@ -86,8 -79,6 +86,8 @@@ public class FileListListAdapter extend
      private enum ViewType {LIST_ITEM, GRID_IMAGE, GRID_ITEM };
  
      private SharedPreferences mAppPreferences;
 +
 +    private HashMap<Integer, Boolean> mSelection = new HashMap<Integer, Boolean>();
      
      public FileListListAdapter(
              boolean justFolders, 
@@@ -163,7 -154,7 +163,7 @@@
          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;
@@@ -202,37 -193,38 +202,37 @@@
  
              switch (viewType){
                  case LIST_ITEM:
-                     TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);
+                     TextView fileSizeV = (TextView) view.findViewById(R.id.last_size);
                      TextView fileSizeSeparatorV = (TextView) view.findViewById(R.id.file_separator);
-                     TextView lastModV = (TextView) view.findViewById(R.id.last_mod);
+                     TextView lastModV = (TextView) view.findViewById(R.id.file_mod);
 -                    ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
 +
  
                      lastModV.setVisibility(View.VISIBLE);
                      lastModV.setText(showRelativeTimestamp(file));
  
 -                    checkBoxV.setVisibility(View.GONE);
  
                      fileSizeSeparatorV.setVisibility(View.VISIBLE);
                      fileSizeV.setVisibility(View.VISIBLE);
                      fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));
  
 -                    if (!file.isFolder()) {
 -                        AbsListView parentList = (AbsListView)parent;
 -                        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
 -                            if (parentList.getChoiceMode() == AbsListView.CHOICE_MODE_NONE) {
 -                                checkBoxV.setVisibility(View.GONE);
 -                            } else {
 -                                if (parentList.isItemChecked(position)) {
 -                                    checkBoxV.setImageResource(
 -                                            R.drawable.ic_checkbox_marked);
 -                                } else {
 -                                    checkBoxV.setImageResource(
 -                                            R.drawable.ic_checkbox_blank_outline);
 -                                }
 -                                checkBoxV.setVisibility(View.VISIBLE);
 -                            }
 -                        }
 -
 -                    } else { //Folder
 +//                    if (!file.isFolder()) {
 +//                        AbsListView parentList = (AbsListView)parent;
 +//                        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
 +//                            if (parentList.getChoiceMode() == AbsListView.CHOICE_MODE_NONE) {
 +//                                checkBoxV.setVisibility(View.GONE);
 +//                            } else {
 +//                                if (parentList.isItemChecked(position)) {
 +//                                    checkBoxV.setImageResource(
 +//                                            R.drawable.ic_checkbox_marked);
 +//                                } else {
 +//                                    checkBoxV.setImageResource(
 +//                                            R.drawable.ic_checkbox_blank_outline);
 +//                                }
 +//                                checkBoxV.setVisibility(View.VISIBLE);
 +//                            }
 +//                        }
 +
 +                    if (file.isFolder()) {
                          fileSizeSeparatorV.setVisibility(View.INVISIBLE);
                          fileSizeV.setVisibility(View.INVISIBLE);
                      }
@@@ -316,25 -308,6 +316,25 @@@
  
                      break;
              }
 +
 +            ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
 +            checkBoxV.setVisibility(View.GONE);
 +
 +            AbsListView parentList = (AbsListView)parent;
 +            if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
 +                if (parentList.getChoiceMode() == AbsListView.CHOICE_MODE_NONE) {
 +                    checkBoxV.setVisibility(View.GONE);
 +                } else if (parentList.getCheckedItemCount() > 0){
 +                    if (parentList.isItemChecked(position)) {
 +                        checkBoxV.setImageResource(
 +                                android.R.drawable.checkbox_on_background);
 +                    } else {
 +                        checkBoxV.setImageResource(
 +                                android.R.drawable.checkbox_off_background);
 +                    }
 +                    checkBoxV.setVisibility(View.VISIBLE);
 +                }
 +            }
              
              // For all Views
              
@@@ -348,18 -321,13 +348,18 @@@
              
              // No Folder
              if (!file.isFolder()) {
 -                if (file.isImage() && file.getRemoteId() != null){
 +                if ((file.isImage() || file.isVideo()) && file.getRemoteId() != null){
                      // Thumbnail in Cache?
                      Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
 -                            String.valueOf(file.getRemoteId())
 -                            );
 +                            "t" + String.valueOf(file.getRemoteId()));
                      if (thumbnail != null && !file.needsUpdateThumbnail()){
 -                        fileIcon.setImageBitmap(thumbnail);
 +
 +                        if (file.isVideo()) {
 +                            Bitmap withOverlay = ThumbnailsCacheManager.addVideoOverlay(thumbnail);
 +                            fileIcon.setImageBitmap(withOverlay);
 +                        } else {
 +                            fileIcon.setImageBitmap(thumbnail);
 +                        }
                      } else {
                          // generate new Thumbnail
                          if (ThumbnailsCacheManager.cancelPotentialWork(file, fileIcon)) {
@@@ -377,7 -345,7 +377,7 @@@
                                      task
                                      );
                              fileIcon.setImageDrawable(asyncDrawable);
 -                            task.execute(file);
 +                            task.execute(file, true);
                          }
                      }
  
@@@ -400,12 -368,6 +400,12 @@@
              }
          }
  
 +        if (mSelection.get(position) != null) {
 +            view.setBackgroundColor(Color.rgb(248, 248, 248));
 +        } else {
 +            view.setBackgroundColor(Color.WHITE);
 +        }
 +
          return view;
      }
  
@@@ -432,14 -394,15 +432,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);
              
@@@ -450,7 -413,7 +450,7 @@@
              mFiles = null;
          }
  
 -        mFiles = FileStorageUtils.sortFolder(mFiles);
 +        mFiles = FileStorageUtils.sortOcFolder(mFiles);
          notifyDataSetChanged();
      }
      
@@@ -497,7 -460,7 +497,7 @@@
          FileStorageUtils.mSortAscending = ascending;
          
  
 -        mFiles = FileStorageUtils.sortFolder(mFiles);
 +        mFiles = FileStorageUtils.sortOcFolder(mFiles);
          notifyDataSetChanged();
  
      }
@@@ -510,45 -473,4 +510,45 @@@
      public void setGridMode(boolean gridMode) {
          mGridMode = gridMode;
      }
 +
 +    public boolean isGridMode() {
 +        return mGridMode;
 +    }
 +
 +    public void setNewSelection(int position, boolean checked) {
 +        mSelection.put(position, checked);
 +        notifyDataSetChanged();
 +    }
 +
 +    public void removeSelection(int position) {
 +        mSelection.remove(position);
 +        notifyDataSetChanged();
 +    }
 +
 +    public void removeSelection(){
 +         mSelection.clear();
 +        notifyDataSetChanged();
 +    }
 +
 +    public ArrayList<Integer> getCheckedItemPositions() {
 +        ArrayList<Integer> ids = new ArrayList<Integer>();
 +
 +        for (Map.Entry<Integer, Boolean> entry : mSelection.entrySet()){
 +            if (entry.getValue()){
 +                ids.add(entry.getKey());
 +            }
 +        }
 +        return ids;
 +    }
 +
 +    public ArrayList<OCFile> getCheckedItems() {
 +        ArrayList<OCFile> files = new ArrayList<OCFile>();
 +
 +        for (Map.Entry<Integer, Boolean> entry : mSelection.entrySet()){
 +            if (entry.getValue()){
 +                files.add((OCFile) getItem(entry.getKey()));
 +            }
 +        }
 +        return files;
 +    }
  }
diff --combined src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
index af3bdf0a,54705dab..a72a0ef3
--- a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
@@@ -25,9 -25,7 +25,9 @@@ import java.util.Arrays
  import java.util.Comparator;
  
  import android.content.Context;
 +import android.content.SharedPreferences;
  import android.graphics.Bitmap;
 +import android.preference.PreferenceManager;
  import android.view.LayoutInflater;
  import android.view.View;
  import android.view.ViewGroup;
@@@ -43,7 -41,6 +43,7 @@@ import com.owncloud.android.lib.common.
  import com.owncloud.android.utils.BitmapUtils;
  import com.owncloud.android.utils.DisplayUtils;
  import com.owncloud.android.utils.MimetypeIconUtil;
 +import com.owncloud.android.utils.FileStorageUtils;
  
  /**
   * This Adapter populates a ListView with all files and directories contained
@@@ -56,18 -53,9 +56,18 @@@ public class LocalFileListAdapter exten
      private Context mContext;
      private File mDirectory;
      private File[] mFiles = null;
 +    private SharedPreferences mAppPreferences;
      
      public LocalFileListAdapter(File directory, Context context) {
          mContext = context;
 +
 +        mAppPreferences = PreferenceManager
 +                .getDefaultSharedPreferences(mContext);
 +
 +        // Read sorting order, default to sort by name ascending
 +        FileStorageUtils.mSortOrder = mAppPreferences.getInt("sortOrder", 0);
 +        FileStorageUtils.mSortAscending = mAppPreferences.getBoolean("sortAscending", true);
 +
          swapDirectory(directory);
      }
  
@@@ -132,9 -120,9 +132,9 @@@
              }
              fileIcon.setTag(file.hashCode());
  
-             TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);
+             TextView fileSizeV = (TextView) view.findViewById(R.id.last_size);
              TextView fileSizeSeparatorV = (TextView) view.findViewById(R.id.file_separator);
-             TextView lastModV = (TextView) view.findViewById(R.id.last_mod);
+             TextView lastModV = (TextView) view.findViewById(R.id.file_mod);
              ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
              if (!file.isDirectory()) {
                  fileSizeSeparatorV.setVisibility(View.VISIBLE);
@@@ -245,23 -233,7 +245,23 @@@
                  }
              
              });
 +
 +            mFiles = FileStorageUtils.sortLocalFolder(mFiles);
          }
          notifyDataSetChanged();
      }
 +
 +    public void setSortOrder(Integer order, boolean ascending) {
 +        SharedPreferences.Editor editor = mAppPreferences.edit();
 +        editor.putInt("sortOrder", order);
 +        editor.putBoolean("sortAscending", ascending);
 +        editor.commit();
 +
 +        FileStorageUtils.mSortOrder = order;
 +        FileStorageUtils.mSortAscending = ascending;
 +
 +        mFiles = FileStorageUtils.sortLocalFolder(mFiles);
 +        notifyDataSetChanged();
 +
 +    }
  }