Added item name to ContentDescription property in list item linearlayout of FileListL...

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 1df1211..15f6a8b 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -17,7 +17,7 @@
  */\r
 package com.owncloud.android.ui.adapter;\r
 \r
  */\r
 package com.owncloud.android.ui.adapter;\r
 \r

-
+\r

 import java.io.File;\r
 import java.util.Collections;\r
 import java.util.Comparator;\r
 import java.io.File;\r
 import java.util.Collections;\r
 import java.util.Comparator;\r


@@ -35,6 +35,7 @@ import android.view.View;
 import android.view.ViewGroup;\r
 import android.widget.BaseAdapter;\r
 import android.widget.ImageView;\r
 import android.view.ViewGroup;\r
 import android.widget.BaseAdapter;\r
 import android.widget.ImageView;\r

+import android.widget.LinearLayout;\r

 import android.widget.ListAdapter;\r
 import android.widget.ListView;\r
 import android.widget.TextView;\r
 import android.widget.ListAdapter;\r
 import android.widget.ListView;\r
 import android.widget.TextView;\r


@@ -50,7 +51,7 @@ import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.ui.activity.ComponentsGetter;\r
 import com.owncloud.android.utils.DisplayUtils;\r
 import com.owncloud.android.utils.FileStorageUtils;\r
 import com.owncloud.android.ui.activity.ComponentsGetter;\r
 import com.owncloud.android.utils.DisplayUtils;\r
 import com.owncloud.android.utils.FileStorageUtils;\r

-
+\r

 \r
 /**\r
  * This Adapter populates a ListView with all files and folders in an ownCloud\r
 \r
 /**\r
  * This Adapter populates a ListView with all files and folders in an ownCloud\r


@@ -60,7 +61,7 @@ import com.owncloud.android.utils.FileStorageUtils;
  * @author Tobias Kaminsky\r
  * @author David A. Velasco\r
  */\r
  * @author Tobias Kaminsky\r
  * @author David A. Velasco\r
  */\r

-public class FileListListAdapter extends BaseAdapter implements ListAdapter {
+public class FileListListAdapter extends BaseAdapter implements ListAdapter {\r

     private final static String PERMISSION_SHARED_WITH_ME = "S";\r
     \r
     private Context mContext;\r
     private final static String PERMISSION_SHARED_WITH_ME = "S";\r
     \r
     private Context mContext;\r


@@ -68,8 +69,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
     private Vector<OCFile> mFiles = null;\r
     private boolean mJustFolders;\r
 \r
     private Vector<OCFile> mFiles = null;\r
     private boolean mJustFolders;\r
 \r

-    private FileDataStorageManager mStorageManager;
-    private Account mAccount;
+    private FileDataStorageManager mStorageManager;\r
+    private Account mAccount;\r

     private ComponentsGetter mTransferServiceGetter;\r
     private Integer mSortOrder;\r
     public static final Integer SORT_NAME = 0;\r
     private ComponentsGetter mTransferServiceGetter;\r
     private Integer mSortOrder;\r
     public static final Integer SORT_NAME = 0;\r


@@ -87,8 +88,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
         mJustFolders = justFolders;\r
         mContext = context;\r
         mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);\r
         mJustFolders = justFolders;\r
         mContext = context;\r
         mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);\r

-
-        mTransferServiceGetter = transferServiceGetter;
+\r
+        mTransferServiceGetter = transferServiceGetter;\r

         \r
         mAppPreferences = PreferenceManager\r
                 .getDefaultSharedPreferences(mContext);\r
         \r
         mAppPreferences = PreferenceManager\r
                 .getDefaultSharedPreferences(mContext);\r


@@ -96,13 +97,13 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
         // Read sorting order, default to sort by name ascending\r
         mSortOrder = mAppPreferences\r
                 .getInt("sortOrder", 0);\r
         // Read sorting order, default to sort by name ascending\r
         mSortOrder = mAppPreferences\r
                 .getInt("sortOrder", 0);\r

-        mSortAscending = mAppPreferences.getBoolean("sortAscending", true);
+        mSortAscending = mAppPreferences.getBoolean("sortAscending", true);\r

         \r
         // initialise thumbnails cache on background thread\r
         new ThumbnailsCacheManager.InitDiskCacheTask().execute();\r
 \r
     }\r
         \r
         // initialise thumbnails cache on background thread\r
         new ThumbnailsCacheManager.InitDiskCacheTask().execute();\r
 \r
     }\r

-    
+    \r

     @Override\r
     public boolean areAllItemsEnabled() {\r
         return true;\r
     @Override\r
     public boolean areAllItemsEnabled() {\r
         return true;\r


@@ -151,6 +152,9 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
             TextView fileName = (TextView) view.findViewById(R.id.Filename);           \r
             String name = file.getFileName();\r
 \r
             TextView fileName = (TextView) view.findViewById(R.id.Filename);           \r
             String name = file.getFileName();\r
 \r

+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.ListItemLayout);\r
+            linearLayout.setContentDescription("LinearLayout-" + name);\r
+\r

             fileName.setText(name);\r
             ImageView fileIcon = (ImageView) view.findViewById(R.id.imageView1);\r
             fileIcon.setTag(file.getFileId());\r
             fileName.setText(name);\r
             ImageView fileIcon = (ImageView) view.findViewById(R.id.imageView1);\r
             fileIcon.setTag(file.getFileId());\r


@@ -237,7 +241,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                             DisplayUtils.getResourceId(file.getMimetype(), file.getFileName())\r
                     );\r
                 }\r
                             DisplayUtils.getResourceId(file.getMimetype(), file.getFileName())\r
                     );\r
                 }\r

-
+\r

                 if (checkIfFileIsSharedWithMe(file)) {\r
                     sharedWithMeIconV.setVisibility(View.VISIBLE);\r
                 }\r
                 if (checkIfFileIsSharedWithMe(file)) {\r
                     sharedWithMeIconV.setVisibility(View.VISIBLE);\r
                 }\r


@@ -250,7 +254,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 //                } else {\r
                     fileSizeV.setVisibility(View.INVISIBLE);\r
 //                }\r
 //                } else {\r
                     fileSizeV.setVisibility(View.INVISIBLE);\r
 //                }\r

-
+\r

                 lastModV.setVisibility(View.VISIBLE);\r
                 lastModV.setText(showRelativeTimestamp(file));\r
                 checkBoxV.setVisibility(View.GONE);\r
                 lastModV.setVisibility(View.VISIBLE);\r
                 lastModV.setText(showRelativeTimestamp(file));\r
                 checkBoxV.setVisibility(View.GONE);\r


@@ -281,7 +285,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 \r
         return view;\r
     }\r
 \r
         return view;\r
     }\r

-
+\r

     /**\r
      * Local Folder size in human readable format\r
      * \r
     /**\r
      * Local Folder size in human readable format\r
      * \r


@@ -320,8 +324,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
             return result;\r
         }\r
         return 0;\r
             return result;\r
         }\r
         return 0;\r

-    } 
-
+    } \r
+\r

     @Override\r
     public int getViewTypeCount() {\r
         return 1;\r
     @Override\r
     public int getViewTypeCount() {\r
         return 1;\r


@@ -519,5 +523,5 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
     private CharSequence showRelativeTimestamp(OCFile file){\r
         return DisplayUtils.getRelativeDateTimeString(mContext, file.getModificationTimestamp(),\r
                 DateUtils.SECOND_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0);\r
     private CharSequence showRelativeTimestamp(OCFile file){\r
         return DisplayUtils.getRelativeDateTimeString(mContext, file.getModificationTimestamp(),\r
                 DateUtils.SECOND_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0);\r

-    }
+    }\r

 }\r
 }\r