From: David A. Velasco Date: Thu, 19 Mar 2015 11:59:17 +0000 (+0100) Subject: Merge pull request #914 from owncloud/accessibility X-Git-Tag: oc-android-1.7.1_signed^2~17 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5ebd90ed2d43a15e8ae5a53465c3c02d062998f8?ds=inline;hp=--cc Merge pull request #914 from owncloud/accessibility Added accesibility descriptions as a mean to add automatic tests un UI. --- 5ebd90ed2d43a15e8ae5a53465c3c02d062998f8 diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java index 9fd7efe4,fbdf69d8..d4c1c7b2 --- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java @@@ -38,7 -37,9 +38,8 @@@ import android.view.View import android.view.ViewGroup; import android.widget.AbsListView; import android.widget.BaseAdapter; -import android.widget.GridView; import android.widget.ImageView; + import android.widget.LinearLayout; import android.widget.ListAdapter; import android.widget.TextView; @@@ -313,9 -306,9 +317,10 @@@ public class FileListListAdapter extend } } } else { - fileIcon.setImageResource(DisplayUtils.getFileTypeIconId(file.getMimetype(), file.getFileName())); + fileIcon.setImageResource(DisplayUtils.getFileTypeIconId(file.getMimetype(), + file.getFileName())); } + } else { // Folder if (checkIfFileIsSharedWithMe(file)) {