From fc9d4d06469888c82c32ae53bb98b03c45ac78d5 Mon Sep 17 00:00:00 2001 From: Kirk Date: Wed, 14 Oct 2026 02:17:31 +0800 Subject: [PATCH] fix: the Android keyboard opens on the first tap after the system dismissed it (#665) --- .../droiddeck/launcher/input/KeyboardHost.kt | 7 ++- .../launcher/input/KeyboardHostTest.kt | 55 +++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/input/KeyboardHostTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt b/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt index 48e54c7918..b182796474 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt @@ -2,10 +2,12 @@ package com.droiddeck.launcher.input import android.app.Activity import android.content.Context +import android.os.Build import android.text.InputType import android.view.KeyCharacterMap import android.view.KeyEvent import android.view.View +import android.view.WindowInsets import android.view.inputmethod.BaseInputConnection import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputConnection @@ -53,7 +55,10 @@ class KeyboardHost( return KeyConnection() } - fun toggle() = if (shown) hide() else show() + fun toggle() = if (shown && imeVisible()) hide() else show() + + private fun imeVisible() = Build.VERSION.SDK_INT < Build.VERSION_CODES.R || + rootWindowInsets?.isVisible(WindowInsets.Type.ime()) != false fun show() { shown = true diff --git a/app/src/test/java/com/droiddeck/launcher/input/KeyboardHostTest.kt b/app/src/test/java/com/droiddeck/launcher/input/KeyboardHostTest.kt new file mode 100644 index 0000000000..eff9197525 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/KeyboardHostTest.kt @@ -0,0 +1,55 @@ +package com.droiddeck.launcher.input + +import android.app.Activity +import android.content.Context +import android.os.Looper +import android.view.inputmethod.InputMethodManager +import android.widget.FrameLayout +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(manifest = Config.NONE) +class KeyboardHostTest { + private lateinit var imm: InputMethodManager + private lateinit var host: KeyboardHost + + @Before fun setUp() { + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + imm = activity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager + host = KeyboardHost(activity) + activity.setContentView(FrameLayout(activity).apply { addView(host) }) + idle() + } + + @Config(sdk = [33]) + @Test fun toggleShowsAKeyboardTheSystemDismissed() { + host.show() + idle() + imm.hideSoftInputFromWindow(host.windowToken, 0) + idle() + host.toggle() + idle() + assertTrue(shadowOf(imm).isSoftInputVisible) + assertTrue(host.shown) + } + + @Config(sdk = [28]) + @Test fun toggleHidesAKeyboardThatIsShowing() { + host.show() + idle() + host.toggle() + idle() + assertFalse(shadowOf(imm).isSoftInputVisible) + assertFalse(host.shown) + } + + private fun idle() = shadowOf(Looper.getMainLooper()).idle() +}