FireTV fix (update1)

yuliskov · Mar 25, 2018 · 0ed1761 · 0ed1761
1 parent e9cc575
commit 0ed1761
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/leankeykeyboard/build.gradle b/leankeykeyboard/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "org.liskovsoft.leankeykeyboard.pro"
         minSdkVersion project.properties.minSdkVersion
         targetSdkVersion project.properties.targetSdkVersion
-        versionCode 57
-        versionName "4.3.7"
+        versionCode 58
+        versionName "4.3.8"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

diff --git a/leankeykeyboard/src/main/java/com/google/leanback/ime/LeanbackImeService.java b/leankeykeyboard/src/main/java/com/google/leanback/ime/LeanbackImeService.java
@@ -270,10 +270,11 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
         return isInputViewShown() && mKeyboardController.onKeyUp(keyCode, event) || super.onKeyUp(keyCode, event);
     }
 
-    @Override
-    public boolean onShowInputRequested(int flags, boolean configChange) {
-        return true;
-    }
+    // FireTV fix
+    //@Override
+    //public boolean onShowInputRequested(int flags, boolean configChange) {
+    //    return true;
+    //}
 
     @Override
     public int onStartCommand(final Intent intent, final int flags, final int startId) {
@@ -305,10 +306,11 @@ public void onStartInputView(EditorInfo info, boolean restarting) {
 
         // FireTV: fix accidental kbd pop-ups
         // more info: https://forum.xda-developers.com/fire-tv/general/guide-change-screen-keyboard-to-leankey-t3527675/page2
-        //if (!mKeyboardController.showInputView()) {
-        //    onHideIme();
-        //    return;
-        //}
+        updateInputViewShown();
+        if (!mKeyboardController.showInputView()) {
+            onHideIme();
+            return;
+        }
 
         mKeyboardController.onStartInputView();
         sendBroadcast(new Intent(IME_OPEN));