focus,flag,back key

app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

@@ -618,7 +618,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
         int episodeNameLength = items.isEmpty() ? 0 : items.get(0).getName().length();
         int numColumns = 10;
         if (episodeNameLength > 40) numColumns = 2;
-        else if (episodeNameLength > 20) numColumns = 3;
+        else if (episodeNameLength > 15) numColumns = 3;
         else if (episodeNameLength > 10) numColumns = 4;
         else if (episodeNameLength > 6) numColumns = 6;
         else if (episodeNameLength > 2) numColumns = 8;
@@ -1507,6 +1507,11 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
 
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
+        if (!isFullscreen() && KeyUtil.isBackKey(event) && getFocus1() != mBinding.video) {
+            mBinding.video.requestFocus();
+            mFocus1 = null;
+            return true;
+        }
         if (isFullscreen() && KeyUtil.isMenuKey(event)) onToggle();
         if (isVisible(mBinding.control.getRoot())) setR1Callback();
         if (isVisible(mBinding.control.getRoot())) mFocus2 = getCurrentFocus();

app/src/leanback/res/layout/activity_video.xml

@@ -250,12 +250,23 @@
 
     </LinearLayout>
 
+    <com.fongmi.android.tv.ui.custom.CustomHorizontalGridView
+        android:id="@+id/flag"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/video"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:paddingStart="24dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="24dp"
+        android:visibility="gone" />
+
     <androidx.core.widget.NestedScrollView
         android:id="@+id/scroll"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/video"
-        android:layout_marginTop="16dp"
+        android:layout_below="@+id/flag"
         android:overScrollMode="never">
 
         <LinearLayout
@@ -263,18 +274,6 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <com.fongmi.android.tv.ui.custom.CustomHorizontalGridView
-                android:id="@+id/flag"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                android:paddingStart="24dp"
-                android:paddingTop="8dp"
-                android:paddingEnd="24dp"
-                android:paddingBottom="8dp"
-                android:visibility="gone" />
-
             <com.fongmi.android.tv.ui.custom.CustomHorizontalGridView
                 android:id="@+id/quality"
                 android:layout_width="match_parent"
@@ -284,7 +283,6 @@
                 android:paddingStart="24dp"
                 android:paddingTop="8dp"
                 android:paddingEnd="24dp"
-                android:paddingBottom="8dp"
                 android:visibility="gone" />
 
             <com.fongmi.android.tv.ui.custom.CustomHorizontalGridView
@@ -296,7 +294,6 @@
                 android:paddingStart="24dp"
                 android:paddingTop="8dp"
                 android:paddingEnd="24dp"
-                android:paddingBottom="8dp"
                 android:focusable="false"
                 android:visibility="gone" />
 
@@ -309,7 +306,6 @@
                 android:paddingStart="24dp"
                 android:paddingTop="8dp"
                 android:paddingEnd="24dp"
-                android:paddingBottom="8dp"
                 android:visibility="gone" />
 
             <androidx.leanback.widget.VerticalGridView
@@ -321,7 +317,6 @@
                 android:paddingStart="24dp"
                 android:paddingTop="8dp"
                 android:paddingEnd="24dp"
-                android:paddingBottom="8dp"
                 android:focusable="false"
                 android:visibility="gone" />
 
@@ -334,7 +329,6 @@
                 android:paddingStart="24dp"
                 android:paddingTop="8dp"
                 android:paddingEnd="24dp"
-                android:paddingBottom="8dp"
                 android:visibility="gone" />
 
             <androidx.leanback.widget.HorizontalGridView