[Android] Browser: Open videos directly via VideoPlayerActivity (fix conflicts)

[Thomas Guillem]

vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon May  4 15:44:00 2015 +0200| [52a67879ff809852139684cf7a9a8494ab7c8a3a] | committer: Thomas Guillem

Browser: Open videos directly via VideoPlayerActivity (fix conflicts)

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=52a67879ff809852139684cf7a9a8494ab7c8a3a
---

 vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserAdapter.java |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserAdapter.java b/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserAdapter.java
index 2925473..3c9d580 100644
--- a/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserAdapter.java
@@ -118,6 +118,8 @@ public class BaseBrowserAdapter extends  RecyclerView.Adapter<RecyclerView.ViewH
                 MediaWrapper mw = (MediaWrapper) getItem(holder.getAdapterPosition());
                 if (mw.getType() == MediaWrapper.TYPE_DIR)
                     fragment.browse(mw, holder.getAdapterPosition());
+                else if (mw.getType() == MediaWrapper.TYPE_VIDEO)
+                    Util.openMedia(v.getContext(), mw);
                 else {
                     int position = 0;
                     LinkedList<String> mediaLocations = new LinkedList<String>();