update

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

@@ -54,8 +54,11 @@ public class HistoryActivity extends BaseActivity implements HistoryAdapter.OnCl
 
     private void getHistory() {
         mAdapter.addAll(History.get());
-        mBinding.delete.setVisibility(mAdapter.getItemCount() > 0 ? View.VISIBLE : View.GONE);
-        App.post(() -> mBinding.recycler.requestFocus(), 300);
+        App.post(() -> {
+            mBinding.delete.setVisibility(mAdapter.getItemCount() > 0 ? View.VISIBLE : View.GONE);
+            mBinding.delete.setFocusable(true);
+        }, 500);
+        mBinding.recycler.requestFocus();
     }
 
     private void onDelete(View view) {
@@ -75,8 +78,18 @@ public class HistoryActivity extends BaseActivity implements HistoryAdapter.OnCl
 
     @Override
     public void onItemDelete(History item) {
-        mAdapter.delete(item.delete());
+        mBinding.delete.setFocusable(false);
+        int index = mAdapter.delete(item.delete());
         if (mAdapter.getItemCount() == 0) mAdapter.setDelete(false);
+        App.post(() -> {
+            mBinding.delete.setFocusable(true);
+        }, 300);
+        if (mAdapter.getItemCount() > 0) {
+            int nextIndex = index + 1;
+            if (index == mAdapter.getItemCount()) nextIndex = index - 1;
+            View view  = mBinding.recycler.getLayoutManager().findViewByPosition(nextIndex);
+            if (view != null) view.requestFocus();
+        }
     }
 
     @Override

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

@@ -256,7 +256,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
         if (mAdapter.size() > index && index > -1) mAdapter.removeItems(index, mAdapter.size() - index);
         if (getHome().getKey().isEmpty()) return;
         mViewModel.homeContent();
-        mAdapter.add("progress");
+        if (Setting.getHomeRecommend() == 1) mAdapter.add("progress");
     }
 
     private void addVideo(Result result) {

app/src/leanback/java/com/fongmi/android/tv/ui/adapter/HistoryAdapter.java

@@ -69,11 +69,12 @@ public class HistoryAdapter extends RecyclerView.Adapter<HistoryAdapter.ViewHold
         History.delete(VodConfig.getCid());
     }
 
-    public void delete(History item) {
+    public int delete(History item) {
         int index = mItems.indexOf(item);
-        if (index == -1) return;
+        if (index == -1) return index;
         mItems.remove(index);
         notifyItemRemoved(index);
+        return index;
     }
 
     @Override

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

@@ -32,6 +32,7 @@
             android:layout_height="32dp"
             android:background="@drawable/selector_image"
             android:src="@drawable/ic_action_delete"
+            android:focusable="false"
             android:visibility="gone"
             tools:visibility="visible" />