home button, home menu

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

@@ -262,10 +262,14 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
         coolDown = true;
     }
 
+    private boolean hasSettingButton() {
+        return Setting.getHomeButtons("").contains("6");
+    }
+
     @Override
     public void onItemClick(Class item) {
         if (mBinding.pager.getCurrentItem() == 0) {
-            if ("".equals(Setting.getHomeButtons(""))) MenuDialog.create(this).show();
+            if (!hasSettingButton()) MenuDialog.create(this).show();
             else SiteDialog.create(this).show();
         } else {
             updateFilter(item);
@@ -352,7 +356,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
 
     @Override
     public void showDialog() {
-        if ("".equals(Setting.getHomeButtons(""))) {
+        if (!hasSettingButton()) {
             MenuDialog.create(this).show();
             return;
         }
@@ -454,7 +458,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
         boolean isHomeFragment = mBinding.pager.getCurrentItem() == 0;
-        if (isHomeFragment && "".equals(Setting.getHomeButtons(""))) {
+        if (isHomeFragment && !hasSettingButton()) {
             MenuDialog.create(this).show();
         } else if (isHomeFragment && KeyUtil.isMenuKey(event)) {
             if (Setting.getHomeMenuKey() == 0) MenuDialog.create(this).show();

app/src/leanback/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java

@@ -1,5 +1,6 @@
 package com.fongmi.android.tv.ui.fragment;
 
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -147,9 +148,9 @@ public class HomeFragment extends BaseFragment implements VodPresenter.OnClickLi
 
     private void refreshFuncRow() {
         if (homeUI == Setting.getHomeUI() && Setting.getHomeButtons("").equals(button)) return;
+        if (!TextUtils.isEmpty(button)) mAdapter.removeItems(0, 1);
         homeUI = Setting.getHomeUI();
         button = Setting.getHomeButtons("");
-        mAdapter.removeItems(0, 1);
         ListRow funcRow = getFuncRow();
         if (funcRow != null) mAdapter.add(0, funcRow);
     }