diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
index 90edfd3ca..8906e9e81 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
@@ -708,9 +708,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
@Override
public void onMenu() {
- if (isVisible(mBinding.control.home)) showControl(mBinding.control.home);
- else if (isVisible(mBinding.control.line)) showControl(mBinding.control.line);
- else showControl(mBinding.control.player);
+ showControl(mBinding.control.player);
}
@Override
diff --git a/app/src/leanback/res/layout/view_control_live.xml b/app/src/leanback/res/layout/view_control_live.xml
index 8757e8ad4..40efa841d 100644
--- a/app/src/leanback/res/layout/view_control_live.xml
+++ b/app/src/leanback/res/layout/view_control_live.xml
@@ -24,30 +24,12 @@
android:orientation="horizontal">
-
-
+ android:text="@string/play"
+ android:textColor="@color/grey_700"
+ android:textSize="18sp" />
+
+
+
+
+
+
搜索
收藏
推送
- 设定
+ 设置
最近观看
更新推荐
+
+ 设置
+
“%s”的搜索结果
diff --git a/app/src/leanback/res/values-zh-rTW/strings.xml b/app/src/leanback/res/values-zh-rTW/strings.xml
index 403a145b2..2ec9064c9 100644
--- a/app/src/leanback/res/values-zh-rTW/strings.xml
+++ b/app/src/leanback/res/values-zh-rTW/strings.xml
@@ -10,6 +10,9 @@
最近觀看
更新推薦
+
+ 設定
+
「%s」的搜尋結果
diff --git a/app/src/leanback/res/values/strings.xml b/app/src/leanback/res/values/strings.xml
index b091a85d3..7f7cda826 100644
--- a/app/src/leanback/res/values/strings.xml
+++ b/app/src/leanback/res/values/strings.xml
@@ -10,6 +10,9 @@
History
Recommend
+
+ Setting
+
Search results for %s
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Group.java b/app/src/main/java/com/fongmi/android/tv/bean/Group.java
index 619f7cb66..baeaf938d 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Group.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Group.java
@@ -108,12 +108,8 @@ public class Group {
return getName().equals(ResUtil.getString(R.string.keep));
}
- public boolean isSetting() {
- return getName().equals(ResUtil.getString(R.string.live_setting));
- }
-
public boolean skip() {
- return isKeep() || isSetting();
+ return isKeep();
}
public void loadLogo(ImageView view) {
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index cbcf07139..577c4ad1e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -10,7 +10,6 @@
密码
未分类
- 设定
正在播放:%s
线路 %s
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index f95d8cdef..3e030edb4 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -10,7 +10,6 @@
密碼
未分類
- 設定
正在播放:%s
來源 %s
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9c2434cd8..12ef297b7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,7 +11,6 @@
Pass
Group
- Setting
Playing: %s
Line %s