norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

do not intercept clicks in FileSystemAdapter

Browse Source
This commit is contained in:
Adrian Ulrich 2016-07-24 14:43:07 +02:00
parent de0247b04a
commit d0e1882f55
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java
View File

@ -48,7 +48,6 @@ import java.util.regex.Pattern;
public class FileSystemAdapter public class FileSystemAdapter
extends BaseAdapter extends BaseAdapter
implements LibraryAdapter implements LibraryAdapter
, View.OnClickListener
{ {
private static final Pattern SPACE_SPLIT = Pattern.compile("\\s+"); private static final Pattern SPACE_SPLIT = Pattern.compile("\\s+");
private static final Pattern FILE_SEPARATOR = Pattern.compile(File.separator); private static final Pattern FILE_SEPARATOR = Pattern.compile(File.separator);
@ -200,7 +199,6 @@ public class FileSystemAdapter
holder = new ViewHolder(); holder = new ViewHolder();
row.setTag(holder); row.setTag(holder);
row.setOnClickListener(this);
row.getCoverView().setImageDrawable(mFolderIcon); row.getCoverView().setImageDrawable(mFolderIcon);
} else { } else {
row = (DraggableRow)convertView; row = (DraggableRow)convertView;
@ -306,8 +304,12 @@ public class FileSystemAdapter
return intent; return intent;
} }
@Override /**
public void onClick(View view) { * A row was clicked: this was dispatched by LibraryPagerAdapter
*
* @param View view which was clicked
*/
public void onViewClicked(View view) {
Intent intent = createData(view); Intent intent = createData(view);
boolean isFolder = intent.getBooleanExtra(LibraryAdapter.DATA_EXPANDABLE, false); boolean isFolder = intent.getBooleanExtra(LibraryAdapter.DATA_EXPANDABLE, false);

2
src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java
View File

@ -844,7 +844,7 @@ public class LibraryPagerAdapter
public void onItemClick (AdapterView<?> parent, View view, int position, long id) { public void onItemClick (AdapterView<?> parent, View view, int position, long id) {
int type = (Integer)parent.getTag(); int type = (Integer)parent.getTag();
if (type == MediaUtils.TYPE_FILE) { if (type == MediaUtils.TYPE_FILE) {
mFilesAdapter.onClick(view); mFilesAdapter.onViewClicked(view);
} else { } else {
Intent intent = id == -1 ? createHeaderIntent(view) : mCurrentAdapter.createData(view); Intent intent = id == -1 ? createHeaderIntent(view) : mCurrentAdapter.createData(view);
mActivity.onItemClicked(intent); mActivity.onItemClicked(intent);