From 988f897da7c0ebece1c461f521d6e3b833b64b59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20M=C3=A9tais?= <geoffrey.metais@gmail.com>
Date: Mon, 30 May 2016 18:09:21 +0200
Subject: [PATCH] TV: Fix directories selection

---
 vlc-android/res/layout/directory_view_item.xml     |  3 ++-
 .../vlc/gui/browser/BaseBrowserAdapter.java        |  7 +++++++
 .../vlc/gui/browser/StorageBrowserFragment.java    | 14 +++++++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/vlc-android/res/layout/directory_view_item.xml b/vlc-android/res/layout/directory_view_item.xml
index c71db83e9..0f92df6a9 100644
--- a/vlc-android/res/layout/directory_view_item.xml
+++ b/vlc-android/res/layout/directory_view_item.xml
@@ -38,7 +38,7 @@
         android:orientation="horizontal"
         android:focusable="true"
         android:clickable="@{holder != null}"
-        android:longClickable="@{hasContextMenu}"
+        android:longClickable="@{hasContextMenu || storage != null}"
         android:onClick="@{holder.onClick}"
         android:background="@drawable/background_item">
 
@@ -49,6 +49,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="15dp"
             android:visibility="@{type == 2 ? View.VISIBLE : View.GONE}"
+            android:focusable="false"
             android:enabled="@{checkEnabled}"
             android:checked="@{checked}"
             android:onClick="@{holder.onCheckBoxClick}"/>
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 c7dad55cb..0a6c8e8a6 100644
--- a/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserAdapter.java
@@ -140,6 +140,13 @@ public class BaseBrowserAdapter extends  RecyclerView.Adapter<RecyclerView.ViewH
             binding.setHolder(this);
             v.findViewById(R.id.layout_item).setTag(R.id.layout_item, this);
             v.setTag(binding);
+            v.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    binding.browserCheckbox.toggle();
+                    return true;
+                }
+            });
         }
 
         public void setContextMenuListener() {
diff --git a/vlc-android/src/org/videolan/vlc/gui/browser/StorageBrowserFragment.java b/vlc-android/src/org/videolan/vlc/gui/browser/StorageBrowserFragment.java
index f45e5ae03..ef770fc83 100644
--- a/vlc-android/src/org/videolan/vlc/gui/browser/StorageBrowserFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/browser/StorageBrowserFragment.java
@@ -36,8 +36,9 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import org.videolan.libvlc.Media;
-import org.videolan.vlc.media.MediaWrapper;
 import org.videolan.vlc.R;
+import org.videolan.vlc.VLCApplication;
+import org.videolan.vlc.media.MediaWrapper;
 import org.videolan.vlc.util.AndroidDevices;
 import org.videolan.vlc.util.CustomDirectories;
 
@@ -82,6 +83,17 @@ public class StorageBrowserFragment extends FileBrowserFragment {
         return v;
     }
 
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        if (VLCApplication.showTvUi()) {
+            if (mRoot)
+                mFAB.requestFocus();
+            else
+                mRecyclerView.requestFocus();
+        }
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-- 
GitLab