Merge branch 'dev' into release

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.fongmi.android.tv"
         minSdk 21
         targetSdk 28
-        versionCode 228
-        versionName "0301"
+        versionCode 229
+        versionName "2.2.9"
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]

app/src/leanback/java/com/fongmi/android/tv/bean/Func.java

@@ -59,7 +59,7 @@ public class Func {
     @SuppressLint("NonConstantResourceId")
     public void setDrawable() {
         switch (resId) {
-            case R.string.home_history:
+            case R.string.home_history_short:
                 this.drawable = R.drawable.ic_home_history;
                 break;
             case R.string.home_vod:

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

@@ -280,7 +280,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
         adapter.add(Func.create(R.string.home_search));
         adapter.add(Func.create(R.string.home_keep));
         adapter.add(Func.create(R.string.home_push));
-        if (Setting.getHomeMenuKey() == 1 || Setting.getHomeMenuKey() == 2) adapter.add(Func.create(R.string.home_history));
+        if (Setting.getHomeMenuKey() == 1 || Setting.getHomeMenuKey() == 2) adapter.add(Func.create(R.string.home_history_short));
         adapter.add(Func.create(R.string.home_setting));
         ((Func) adapter.get(0)).setNextFocusLeft(((Func) adapter.get(adapter.size() - 1)).getId());
         ((Func) adapter.get(adapter.size() - 1)).setNextFocusRight(((Func) adapter.get(0)).getId());

app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomEditText.java

@@ -3,6 +3,8 @@ package com.fongmi.android.tv.ui.custom;
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.View;
 import android.view.animation.Animation;
 
 import androidx.annotation.NonNull;
@@ -10,6 +12,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatEditText;
 
 import com.fongmi.android.tv.R;
+import com.fongmi.android.tv.utils.KeyUtil;
 import com.fongmi.android.tv.utils.ResUtil;
 
 public class CustomEditText extends AppCompatEditText {
@@ -25,11 +28,26 @@ public class CustomEditText extends AppCompatEditText {
         flicker = ResUtil.getAnim(R.anim.flicker);
     }
 
+    private View focusSearch(KeyEvent event) {
+        if (KeyUtil.isUpKey(event)) return getParent().focusSearch(this, FOCUS_UP);
+        if (KeyUtil.isDownKey(event)) return getParent().focusSearch(this, FOCUS_DOWN);
+        if (KeyUtil.isLeftKey(event) && getSelectionStart() == 0) return getParent().focusSearch(this, FOCUS_LEFT);
+        if (KeyUtil.isRightKey(event) && getSelectionStart() == getText().length()) return getParent().focusSearch(this, FOCUS_RIGHT);
+        return null;
+    }
+
     @Override
     public boolean isFocused() {
         return true;
     }
 
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        View v = focusSearch(event);
+        if (v != null) return v.requestFocus();
+        return super.onKeyDown(keyCode, event);
+    }
+
     @Override
     protected void onFocusChanged(boolean gainFocus, int direction, @Nullable Rect previouslyFocusedRect) {
         super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);

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

@@ -65,6 +65,8 @@
             android:layout_marginBottom="16dp"
             android:layout_toEndOf="@+id/mic"
             android:background="@null"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
             android:hint="@string/search_keyword"
             android:imeOptions="actionDone"
             android:inputType="textCapWords|textAutoCorrect|textAutoComplete"

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

@@ -7,7 +7,8 @@
     <string name="home_keep">收藏</string>
     <string name="home_push">推送</string>
     <string name="home_setting">设置</string>
-    <string name="home_history">历史</string>
+    <string name="home_history_short">历史</string>
+    <string name="home_history">最近观看</string>
     <string name="home_recommend">更新推荐</string>
 
     <!-- Collect -->

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

@@ -7,7 +7,8 @@
     <string name="home_keep">收藏</string>
     <string name="home_push">推送</string>
     <string name="home_setting">設定</string>
-    <string name="home_history">歷史</string>
+    <string name="home_history_short">歷史</string>
+    <string name="home_history">最近觀看</string>
     <string name="home_recommend">更新推薦</string>
 
     <!-- Collect -->

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

@@ -7,6 +7,7 @@
     <string name="home_keep">Keep</string>
     <string name="home_push">Push</string>
     <string name="home_setting">Setting</string>
+    <string name="home_history_short">History</string>
     <string name="home_history">History</string>
     <string name="home_recommend">Recommend</string>
 

app/src/main/java/com/fongmi/android/tv/Setting.java

@@ -421,6 +421,14 @@ public class Setting {
         return Prefers.getInt("small_window_back_key", 0);
     }
 
+    public static void putHomeChangeConfig(boolean change) {
+        Prefers.put("home_change_config", change);
+    }
+
+    public static boolean isHomeChangeConfig() {
+        return Prefers.getBoolean("home_change_config", false);
+    }
+
     public static boolean isAggregatedSearch() {
         return Prefers.getBoolean("aggregated_search", false);
     }

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

@@ -78,11 +78,11 @@
     <string name="setting_size">圖片尺寸</string>
     <string name="setting_aggregated_search">聚合搜索</string>
     <string name="setting_fullscreen_menu_key">全屏選單鍵</string>
-    <string name="setting_home_menu_key">首页選單鍵</string>
+    <string name="setting_home_menu_key">首頁選單鍵</string>
     <string name="setting_home_site_lock">首頁源鎖定</string>
     <string name="setting_incognito">無痕模式</string>
     <string name="setting_small_window_back_key">小窗返回鍵</string>
-    <string name="setting_home_change_config">首页換線</string>
+    <string name="setting_home_change_config">首頁換線</string>
     <string name="setting_doh">DoH</string>
     <string name="setting_proxy">Proxy</string>
     <string name="setting_cache">暫存</string>