[leanback] update live control

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

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

@@ -24,30 +24,12 @@
             android:orientation="horizontal">
 
             <TextView
-                android:id="@+id/home"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="12dp"
-                android:background="@drawable/selector_text"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:textColor="@color/white"
-                android:textSize="14sp"
-                tools:text="首頁" />
-
-            <TextView
-                android:id="@+id/line"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="12dp"
-                android:background="@drawable/selector_text"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:textColor="@color/white"
-                android:textSize="14sp"
-                android:visibility="gone"
-                tools:text="來源 1"
-                tools:visibility="visible" />
+                android:text="@string/play"
+                android:textColor="@color/grey_700"
+                android:textSize="18sp" />
 
             <TextView
                 android:id="@+id/player"
@@ -144,6 +126,40 @@
                 android:visibility="gone"
                 tools:visibility="visible" />
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="12dp"
+                android:text="@string/live_setting"
+                android:textColor="@color/grey_700"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/home"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="12dp"
+                android:background="@drawable/selector_text"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:textColor="@color/white"
+                android:textSize="14sp"
+                tools:text="首頁" />
+
+            <TextView
+                android:id="@+id/line"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="12dp"
+                android:background="@drawable/selector_text"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:textColor="@color/white"
+                android:textSize="14sp"
+                android:visibility="gone"
+                tools:text="來源 1"
+                tools:visibility="visible" />
+
             <TextView
                 android:id="@+id/invert"
                 android:layout_width="wrap_content"

app/src/leanback/res/values-zh-rCN/strings.xml

@@ -6,10 +6,13 @@
     <string name="home_search">搜索</string>
     <string name="home_keep">收藏</string>
     <string name="home_push">推送</string>
-    <string name="home_setting">设定</string>
+    <string name="home_setting">设置</string>
     <string name="home_history">最近观看</string>
     <string name="home_recommend">更新推荐</string>
 
+    <!-- Live -->
+    <string name="live_setting">设置</string>
+
     <!-- Collect -->
     <string name="collect_result">“<xliff:g name="name">%s</xliff:g>”的搜索结果</string>
 

app/src/leanback/res/values-zh-rTW/strings.xml

@@ -10,6 +10,9 @@
     <string name="home_history">最近觀看</string>
     <string name="home_recommend">更新推薦</string>
 
+    <!-- Live -->
+    <string name="live_setting">設定</string>
+
     <!-- Collect -->
     <string name="collect_result">「<xliff:g name="name">%s</xliff:g>」的搜尋結果</string>
 

app/src/leanback/res/values/strings.xml

@@ -10,6 +10,9 @@
     <string name="home_history">History</string>
     <string name="home_recommend">Recommend</string>
 
+    <!-- Live -->
+    <string name="live_setting">Setting</string>
+
     <!-- Collect -->
     <string name="collect_result">Search results for <xliff:g name="name">%s</xliff:g></string>
 

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) {

app/src/main/res/values-zh-rCN/strings.xml

@@ -10,7 +10,6 @@
     <!-- Live -->
     <string name="live_pass">密码</string>
     <string name="live_group">未分类</string>
-    <string name="live_setting">设定</string>
     <string name="live_epg_now">正在播放：<xliff:g name="name">%s</xliff:g></string>
     <string name="live_line">线路 <xliff:g name="name">%s</xliff:g></string>
 

app/src/main/res/values-zh-rTW/strings.xml

@@ -10,7 +10,6 @@
     <!-- Live -->
     <string name="live_pass">密碼</string>
     <string name="live_group">未分類</string>
-    <string name="live_setting">設定</string>
     <string name="live_epg_now">正在播放：<xliff:g name="name">%s</xliff:g></string>
     <string name="live_line">來源 <xliff:g name="name">%s</xliff:g></string>
 

app/src/main/res/values/strings.xml

@@ -11,7 +11,6 @@
     <!-- Live -->
     <string name="live_pass">Pass</string>
     <string name="live_group">Group</string>
-    <string name="live_setting">Setting</string>
     <string name="live_epg_now">Playing: <xliff:g name="name">%s</xliff:g></string>
     <string name="live_line">Line <xliff:g name="name">%s</xliff:g></string>