From: jabarros <jabarros@solidgear.es>
Date: Tue, 3 Mar 2015 13:12:15 +0000 (+0100)
Subject: Added item name to ContentDescription property in list item linearlayout of FileListL... 
X-Git-Tag: oc-android-1.7.1_signed^2~17^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/21c775585804213116e490395df6b76561546d4e

Added item name to ContentDescription property in list item linearlayout of FileListListAdapter
---

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 1df1211c..15f6a8bb 100644
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -17,7 +17,7 @@
  */
 package com.owncloud.android.ui.adapter;
 
-
+
 import java.io.File;
 import java.util.Collections;
 import java.util.Comparator;
@@ -35,6 +35,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -50,7 +51,7 @@ import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.FileStorageUtils;
-
+
 
 /**
  * This Adapter populates a ListView with all files and folders in an ownCloud
@@ -60,7 +61,7 @@ import com.owncloud.android.utils.FileStorageUtils;
  * @author Tobias Kaminsky
  * @author David A. Velasco
  */
-public class FileListListAdapter extends BaseAdapter implements ListAdapter {
+public class FileListListAdapter extends BaseAdapter implements ListAdapter {
     private final static String PERMISSION_SHARED_WITH_ME = "S";
     
     private Context mContext;
@@ -68,8 +69,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
     private Vector<OCFile> mFiles = null;
     private boolean mJustFolders;
 
-    private FileDataStorageManager mStorageManager;
-    private Account mAccount;
+    private FileDataStorageManager mStorageManager;
+    private Account mAccount;
     private ComponentsGetter mTransferServiceGetter;
     private Integer mSortOrder;
     public static final Integer SORT_NAME = 0;
@@ -87,8 +88,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
         mJustFolders = justFolders;
         mContext = context;
         mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);
-
-        mTransferServiceGetter = transferServiceGetter;
+
+        mTransferServiceGetter = transferServiceGetter;
         
         mAppPreferences = PreferenceManager
                 .getDefaultSharedPreferences(mContext);
@@ -96,13 +97,13 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
         // Read sorting order, default to sort by name ascending
         mSortOrder = mAppPreferences
                 .getInt("sortOrder", 0);
-        mSortAscending = mAppPreferences.getBoolean("sortAscending", true);
+        mSortAscending = mAppPreferences.getBoolean("sortAscending", true);
         
         // initialise thumbnails cache on background thread
         new ThumbnailsCacheManager.InitDiskCacheTask().execute();
 
     }
-    
+    
     @Override
     public boolean areAllItemsEnabled() {
         return true;
@@ -151,6 +152,9 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
             TextView fileName = (TextView) view.findViewById(R.id.Filename);           
             String name = file.getFileName();
 
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.ListItemLayout);
+            linearLayout.setContentDescription("LinearLayout-" + name);
+
             fileName.setText(name);
             ImageView fileIcon = (ImageView) view.findViewById(R.id.imageView1);
             fileIcon.setTag(file.getFileId());
@@ -237,7 +241,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                             DisplayUtils.getResourceId(file.getMimetype(), file.getFileName())
                     );
                 }
-
+
                 if (checkIfFileIsSharedWithMe(file)) {
                     sharedWithMeIconV.setVisibility(View.VISIBLE);
                 }
@@ -250,7 +254,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 //                } else {
                     fileSizeV.setVisibility(View.INVISIBLE);
 //                }
-
+
                 lastModV.setVisibility(View.VISIBLE);
                 lastModV.setText(showRelativeTimestamp(file));
                 checkBoxV.setVisibility(View.GONE);
@@ -281,7 +285,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 
         return view;
     }
-
+
     /**
      * Local Folder size in human readable format
      * 
@@ -320,8 +324,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
             return result;
         }
         return 0;
-    } 
-
+    } 
+
     @Override
     public int getViewTypeCount() {
         return 1;
@@ -519,5 +523,5 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
     private CharSequence showRelativeTimestamp(OCFile file){
         return DisplayUtils.getRelativeDateTimeString(mContext, file.getModificationTimestamp(),
                 DateUtils.SECOND_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0);
-    }
+    }
 }