AsafMah · AsafMah · Jul 12, 2026 · Jul 4, 2026 · Jul 4, 2026 · Jul 4, 2026
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,12 @@ and this project uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 
 ## [Unreleased]
 
+### Fixed
+- **Fallback gesture suggestions no longer leak dictionary capitalization** when Shift is off; the Java gesture engine now emits canonical lowercase candidates before the existing suggestion presentation-casing layer. (#118)
+
+### Upstream
+- Merged **LeanBitLab/LeanType v3.9.5** (pinned at `8cfe7f1fc`, including v3.9.3/v3.9.4) — adds direct switching to a configured IME, persistent custom-layout state, multi-word suggestion controls, and the v3.9.5 release notes. Fork identity (`LeanTypeDual`, distinct `applicationId`, privacy tiers, and fork-specific features) is preserved.
+
 ## [3.10.0] - 2026-06-20
 
 ### Added

diff --git a/README.md b/README.md
@@ -25,6 +25,7 @@ Type with **both thumbs gliding at the same time**: LeanTypeDual aggregates mult
 - **[🛡️ Offline AI (GGUF)](docs/FEATURES.md#5-offline-proofreading-privacy-focused)** - Private, on-device proofreading and translation using local **GGUF models** powered by `llama.cpp` (Offline build only).
 - **🌐 AI Translation** - Translate selected text using your chosen provider, with a separate model selector.
 - **[✍️ Handwriting Input](docs/FEATURES.md#8-handwriting-input)** - Draw characters directly on a handwriting recognition canvas (Standard version, requires [Leantype-Handwriting-Plugin](https://github.com/LeanBitLab/Leantype-Handwriting-Plugin)).
+- **[👆 Built-in Gesture Typing](docs/FEATURES.md#9-built-in-gesture-typing)** - Gesture typing works out of the box using our new built-in pure-Java fallback engine, removing the strict dependency on native Google libraries.
 - **[🧠 Custom AI Keys](docs/FEATURES.md#4-custom-ai-keys--keywords)** - Assign custom prompts, personas (#editor, #proofread), and labels/tags (themed capsules) to 10 customizable toolbar keys.
 - **📝 Text Expander** - Shortcut → expansion with dynamic placeholders (`%clipboard%`, `%day%`, `%time12%`, `%cursor%`, lists), regex shortcuts, backspace-to-revert, and a guide.
 - **🧠 Smarter learned words** - *graduated trust* keeps a just-learned word below real-dictionary suggestions until you've used it a few times (no premature autocorrect to half-typed words); flag unknown words to **Add** or **Block** them via a Blocklist screen.
@@ -34,6 +35,8 @@ Type with **both thumbs gliding at the same time**: LeanTypeDual aggregates mult
 - **🪟 Floating Keyboard** - Detach the keyboard into a draggable, resizable window (true OS-level overlay), with an optional persistent mode.
 - **⌨️ Dual Toolbar / Split Suggestions** - Split the suggestion strip and toolbar for easier reach.
 - **🖱️ Touchpad Mode** - Swipe the spacebar up for a cursor touchpad with sensitivity controls and edge-scroll acceleration, including a full-screen laptop-style mode.
+- **[⌨️ Direct Switch IME](docs/FEATURES.md#10-direct-switch-target-ime)** - Map custom keycode (`-10076`) to any toolbar key to switch directly to another input method.
+- **[🎨 Custom Layouts](docs/FEATURES.md#11-custom-layouts-customization)** - Save up to five custom layout profiles with persistent slot index tracking.
 - **✍️ Text editing mode** - A toolbar key opens a text-editing overlay for selection, cursor movement, and clipboard actions.
 - **🎨 Modern UI** - "Squircle" key backgrounds, refined icons, and polished aesthetics.
 - **🔄 Google Dictionary Import** - Import your personal dictionary words.
@@ -109,7 +112,7 @@ Type with **both thumbs gliding at the same time**: LeanTypeDual aggregates mult
   <li>Customize keyboard themes (style, colors and background image)</li>
   <li>Customize keyboard layouts</li>
   <li>Multilingual typing</li>
-  <li>Glide typing (<i>requires library</i>)</li>
+  <li>Glide typing (works out of the box with built-in pure-Java fallback engine, or use native library)</li>
   <li>Clipboard history</li>
   <li>One-handed mode</li>
   <li>Split keyboard</li>

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -130,11 +130,11 @@ android {
                 variant.proguardFiles.add(project.layout.buildDirectory.file(project.buildFile.parent + "/proguard-rules.pro"))
             }
             if (variant.flavorName == "standard" || variant.flavorName == "standardfull") {
-                // ponytail: dynamically find all dict files to ignore in standard flavor except main_en-US.dict
+                // Ignore all dictionary assets in standard/standardfull flavors
                 val dictsDir = project.file("src/main/assets/dicts")
                 if (dictsDir.exists() && dictsDir.isDirectory) {
                     dictsDir.listFiles()?.forEach { file ->
-                        if (file.name.endsWith(".dict") && file.name != "main_en-US.dict") {
+                        if (file.name.endsWith(".dict")) {
                             patterns.add(file.name)
                         }
                     }

diff --git a/app/src/main/java/helium314/keyboard/keyboard/KeyboardActionListenerImpl.kt b/app/src/main/java/helium314/keyboard/keyboard/KeyboardActionListenerImpl.kt
@@ -104,7 +104,7 @@ class KeyboardActionListenerImpl(private val latinIME: LatinIME, private val inp
     override fun onCodeInput(primaryCode: Int, x: Int, y: Int, isKeyRepeat: Boolean) {
         val isArrow = primaryCode == KeyCode.ARROW_LEFT || primaryCode == KeyCode.ARROW_RIGHT || primaryCode == KeyCode.ARROW_UP || primaryCode == KeyCode.ARROW_DOWN
         if (isArrow) {
-            val isSelecting = keyboardSwitcher.keyboard?.mId?.isAlphabetShifted == true || sPersistentSelectionModeActive
+            val isSelecting = keyboardSwitcher.keyboard?.mId?.isAlphabetShiftedManually == true || sPersistentSelectionModeActive
             if (isSelecting) {
                 val androidKeyCode = when (primaryCode) {
                     KeyCode.ARROW_LEFT -> KeyEvent.KEYCODE_DPAD_LEFT
@@ -219,7 +219,7 @@ class KeyboardActionListenerImpl(private val latinIME: LatinIME, private val inp
                 || primaryCode == KeyCode.MOVE_START_OF_PAGE || primaryCode == KeyCode.MOVE_END_OF_PAGE
                 || primaryCode == KeyCode.MOVE_START_OF_LINE || primaryCode == KeyCode.MOVE_END_OF_LINE
                 || primaryCode == KeyCode.PAGE_UP || primaryCode == KeyCode.PAGE_DOWN
-        val eventMetaState = if (isEditingNav && (keyboardSwitcher.keyboard?.mId?.isAlphabetShifted == true || sPersistentSelectionModeActive)) {
+        val eventMetaState = if (isEditingNav && (keyboardSwitcher.keyboard?.mId?.isAlphabetShiftedManually == true || sPersistentSelectionModeActive)) {
             metaState or KeyEvent.META_SHIFT_ON
         } else {
             metaState
@@ -391,7 +391,7 @@ class KeyboardActionListenerImpl(private val latinIME: LatinIME, private val inp
         val rtl = RichInputMethodManager.getInstance().currentSubtype.isRtlSubtype
         val steps = if (rtl) -rawSteps else rawSteps
 
-        val isSelecting = keyboardSwitcher.keyboard?.mId?.isAlphabetShifted == true || sPersistentSelectionModeActive
+        val isSelecting = keyboardSwitcher.keyboard?.mId?.isAlphabetShiftedManually == true || sPersistentSelectionModeActive
         if (isSelecting) {
             val code = if (steps < 0) {
                 gestureMoveBackHaptics()

diff --git a/app/src/main/java/helium314/keyboard/keyboard/KeyboardId.java b/app/src/main/java/helium314/keyboard/keyboard/KeyboardId.java
@@ -69,6 +69,11 @@ public final class KeyboardId {
     public static final int ELEMENT_CLIPBOARD_BOTTOM_ROW = 30;
     public static final int ELEMENT_HANDWRITING_BOTTOM_ROW = 31;
     public static final int ELEMENT_TEXT_EDIT = 32;
+    public static final int ELEMENT_CUSTOM1 = 33;
+    public static final int ELEMENT_CUSTOM2 = 34;
+    public static final int ELEMENT_CUSTOM3 = 35;
+    public static final int ELEMENT_CUSTOM4 = 36;
+    public static final int ELEMENT_CUSTOM5 = 37;
 
     public final RichInputMethodSubtype mSubtype;
     public final int mWidth;
@@ -296,6 +301,11 @@ public static String elementIdToName(final int elementId) {
             case ELEMENT_CLIPBOARD_BOTTOM_ROW -> "clipboardBottomRow";
             case ELEMENT_HANDWRITING_BOTTOM_ROW -> "handwritingBottomRow";
             case ELEMENT_TEXT_EDIT -> "editing";
+            case ELEMENT_CUSTOM1 -> "custom1";
+            case ELEMENT_CUSTOM2 -> "custom2";
+            case ELEMENT_CUSTOM3 -> "custom3";
+            case ELEMENT_CUSTOM4 -> "custom4";
+            case ELEMENT_CUSTOM5 -> "custom5";
             default -> null;
         };
     }

diff --git a/app/src/main/java/helium314/keyboard/keyboard/KeyboardSwitcher.java b/app/src/main/java/helium314/keyboard/keyboard/KeyboardSwitcher.java
@@ -338,6 +338,22 @@ public void setSymbolsShiftedKeyboard() {
         setKeyboard(KeyboardId.ELEMENT_SYMBOLS_SHIFTED, KeyboardSwitchState.SYMBOLS_SHIFTED);
     }
 
+    @Override
+    public void setCustomKeyboard(int customIndex) {
+        if (DEBUG_ACTION) {
+            Log.d(TAG, "setCustomKeyboard: " + customIndex);
+        }
+        final int elementId = switch (customIndex) {
+            case 1 -> KeyboardId.ELEMENT_CUSTOM1;
+            case 2 -> KeyboardId.ELEMENT_CUSTOM2;
+            case 3 -> KeyboardId.ELEMENT_CUSTOM3;
+            case 4 -> KeyboardId.ELEMENT_CUSTOM4;
+            case 5 -> KeyboardId.ELEMENT_CUSTOM5;
+            default -> KeyboardId.ELEMENT_ALPHABET;
+        };
+        setKeyboard(elementId, KeyboardSwitchState.OTHER);
+    }
+
     public boolean isImeSuppressedByHardwareKeyboard(
             @NonNull final SettingsValues settingsValues,
             @NonNull final KeyboardSwitchState toggleState) {

diff --git a/app/src/main/java/helium314/keyboard/keyboard/MainKeyboardView.java b/app/src/main/java/helium314/keyboard/keyboard/MainKeyboardView.java
@@ -492,6 +492,9 @@ public void onKeyReleased(@NonNull final Key key, final boolean withAnimation) {
     private void dismissKeyPreview(@NonNull final Key key) {
         if (isHardwareAccelerated()) {
             mKeyPreviewChoreographer.dismissKeyPreview(key);
+        } else {
+            // ponytail: fallback if hardware acceleration is disabled
+            dismissKeyPreviewWithoutDelay(key);
         }
     }
 

diff --git a/app/src/main/java/helium314/keyboard/keyboard/internal/KeyboardState.kt b/app/src/main/java/helium314/keyboard/keyboard/internal/KeyboardState.kt
@@ -39,6 +39,7 @@ class KeyboardState(private val switchActions: SwitchActions) {
         fun toggleNumpad(withSliding: Boolean, autoCapsFlags: Int, recapitalizeMode: RecapitalizeMode?, forceReturnToAlpha: Boolean)
         fun setSymbolsKeyboard()
         fun setSymbolsShiftedKeyboard()
+        fun setCustomKeyboard(customIndex: Int)
 
         /** Request to call back [KeyboardState.onUpdateShiftState]. */
         fun requestUpdatingShiftState(autoCapsFlags: Int, recapitalizeMode: RecapitalizeMode?)
@@ -65,6 +66,8 @@ class KeyboardState(private val switchActions: SwitchActions) {
 
     private var mode = Mode.ALPHABET
     private var modeBeforeNumpad = Mode.ALPHABET
+    // ponytail: track active custom layout index, 0 means default
+    private var lastCustomIndex = 0
     private var isSymbolShifted = false
     private var prevMainKeyboardWasShiftLocked = false
     private var prevSymbolsKeyboardWasShifted = false
@@ -109,6 +112,7 @@ class KeyboardState(private val switchActions: SwitchActions) {
             savedKeyboardState.isValid = false
         } else {
             // Reset keyboard to alphabet mode.
+            lastCustomIndex = 0
             setAlphabetKeyboard(autoCapsFlags, recapitalizeMode)
         }
         switchActions.setOneHandedModeEnabled(onHandedModeEnabled)
@@ -151,6 +155,11 @@ class KeyboardState(private val switchActions: SwitchActions) {
             Mode.CLIPBOARD -> setClipboardKeyboard()
             // don't overwrite toggle state if reloading from orientation change, etc.
             Mode.NUMPAD -> setNumpadKeyboard(false, false, false)
+            Mode.CUSTOM1 -> setCustomKeyboard(1)
+            Mode.CUSTOM2 -> setCustomKeyboard(2)
+            Mode.CUSTOM3 -> setCustomKeyboard(3)
+            Mode.CUSTOM4 -> setCustomKeyboard(4)
+            Mode.CUSTOM5 -> setCustomKeyboard(5)
         }
     }
 
@@ -205,7 +214,7 @@ class KeyboardState(private val switchActions: SwitchActions) {
         if (DebugFlags.DEBUG_ENABLED) {
             Log.d(TAG, "toggleAlphabetAndSymbols: ${stateToString(autoCapsFlags, recapitalizeMode)}")
         }
-        if (mode == Mode.ALPHABET) {
+        if (mode == Mode.ALPHABET || mode.isCustom) {
             prevMainKeyboardWasShiftLocked = alphabetShiftState.isShiftLocked
             if (prevSymbolsKeyboardWasShifted) setSymbolsShiftedKeyboard() else setSymbolsKeyboard()
             prevSymbolsKeyboardWasShifted = false
@@ -223,7 +232,7 @@ class KeyboardState(private val switchActions: SwitchActions) {
         if (DebugFlags.DEBUG_ENABLED) {
             Log.d(TAG, "resetKeyboardStateToAlphabet: ${stateToString(autoCapsFlags, recapitalizeMode)}")
         }
-        if (mode == Mode.ALPHABET) return
+        if (mode == Mode.ALPHABET || mode.isCustom) return
 
         prevSymbolsKeyboardWasShifted = isSymbolShifted
         setAlphabetKeyboard(autoCapsFlags, recapitalizeMode)
@@ -246,6 +255,12 @@ class KeyboardState(private val switchActions: SwitchActions) {
             Log.d(TAG, "setAlphabetKeyboard: ${stateToString(autoCapsFlags, recapitalizeMode)}")
         }
 
+        // ponytail: restore custom layout if active
+        if (lastCustomIndex != 0) {
+            setCustomKeyboard(lastCustomIndex)
+            return
+        }
+
         switchActions.setAlphabetKeyboard()
         mode = Mode.ALPHABET
         isSymbolShifted = false
@@ -254,6 +269,23 @@ class KeyboardState(private val switchActions: SwitchActions) {
         switchActions.requestUpdatingShiftState(autoCapsFlags, recapitalizeMode)
     }
 
+    private fun setCustomKeyboard(customIndex: Int) {
+        if (DebugFlags.DEBUG_ENABLED) {
+            Log.d(TAG, "setCustomKeyboard: $customIndex")
+        }
+        mode = when (customIndex) {
+            1 -> Mode.CUSTOM1
+            2 -> Mode.CUSTOM2
+            3 -> Mode.CUSTOM3
+            4 -> Mode.CUSTOM4
+            5 -> Mode.CUSTOM5
+            else -> Mode.ALPHABET
+        }
+        lastCustomIndex = customIndex
+        recapitalizeMode = null
+        switchActions.setCustomKeyboard(customIndex)
+    }
+
     private fun setSymbolsKeyboard() {
         if (DebugFlags.DEBUG_ENABLED) {
             Log.d(TAG, "setSymbolsKeyboard")
@@ -340,7 +372,7 @@ class KeyboardState(private val switchActions: SwitchActions) {
             setNumpadKeyboard(withSliding, forceReturnToAlpha, rememberState)
             return
         }
-        if (modeBeforeNumpad == Mode.ALPHABET || forceReturnToAlpha) {
+        if (modeBeforeNumpad == Mode.ALPHABET || modeBeforeNumpad.isCustom || forceReturnToAlpha) {
             setAlphabetKeyboard(autoCapsFlags, recapitalizeMode)
             if (prevMainKeyboardWasShiftLocked) {
                 setShiftLocked(true)
@@ -355,6 +387,7 @@ class KeyboardState(private val switchActions: SwitchActions) {
             Mode.EMOJI -> setEmojiKeyboard()
             Mode.CLIPBOARD -> setClipboardKeyboard()
             Mode.NUMPAD -> {}
+            else -> {}
         }
         if (withSliding) switchState = SwitchState.MOMENTARY_FROM_NUMPAD
     }
@@ -510,6 +543,10 @@ class KeyboardState(private val switchActions: SwitchActions) {
         if (recapitalizeMode != null) {
             return
         }
+        if (mode.isCustom) {
+            shiftKeyState.onPress()
+            return
+        }
         if (mode != Mode.ALPHABET) {
             // In symbol mode, just toggle symbol and symbol popup keyboard.
             toggleShiftInSymbols()
@@ -555,6 +592,8 @@ class KeyboardState(private val switchActions: SwitchActions) {
         if (this.recapitalizeMode != null) {
             // We are recapitalizing. We should match the keyboard state to the recapitalize state in priority.
             updateShiftStateForRecapitalize(this.recapitalizeMode)
+        } else if (mode.isCustom) {
+            shiftKeyState.onRelease()
         } else if (mode != Mode.ALPHABET) {
             // In symbol mode, switch back to the previous keyboard mode if the user chords the
             // shift key and another key, then releases the shift key.
@@ -665,11 +704,19 @@ class KeyboardState(private val switchActions: SwitchActions) {
             updateAlphabetShiftState(autoCapsFlags, recapitalizeMode)
         } else when (code) {
             KeyCode.EMOJI -> setEmojiKeyboard()
-            KeyCode.ALPHA -> setAlphabetKeyboard(autoCapsFlags, recapitalizeMode)
+            KeyCode.ALPHA -> {
+                lastCustomIndex = 0
+                setAlphabetKeyboard(autoCapsFlags, recapitalizeMode)
+            }
             // Note: Printing clipboard content is handled in InputLogic.handleFunctionalEvent
             KeyCode.CLIPBOARD -> if (Settings.getValues().mClipboardHistoryEnabled) setClipboardKeyboard()
             KeyCode.NUMPAD -> toggleNumpad(false, autoCapsFlags, recapitalizeMode, false, true)
             KeyCode.SYMBOL -> setSymbolsKeyboard()
+            KeyCode.CUSTOM1 -> setCustomKeyboard(1)
+            KeyCode.CUSTOM2 -> setCustomKeyboard(2)
+            KeyCode.CUSTOM3 -> setCustomKeyboard(3)
+            KeyCode.CUSTOM4 -> setCustomKeyboard(4)
+            KeyCode.CUSTOM5 -> setCustomKeyboard(5)
             KeyCode.TOGGLE_ONE_HANDED_MODE -> setOneHandedModeEnabled(!Settings.getValues().mOneHandedModeEnabled)
             KeyCode.SWITCH_ONE_HANDED_MODE -> switchOneHandedMode()
             KeyCode.TOGGLE_FLOATING_KEYBOARD -> switchActions.toggleFloatingKeyboard()
@@ -679,6 +726,7 @@ class KeyboardState(private val switchActions: SwitchActions) {
     override fun toString(): String {
         val keyboard = when {
             mode == Mode.ALPHABET -> alphabetShiftState.toString()
+            mode.isCustom -> mode.toString()
             isSymbolShifted -> "SYMBOLS_SHIFTED"
             else -> "SYMBOLS"
         }
@@ -707,6 +755,13 @@ class KeyboardState(private val switchActions: SwitchActions) {
         EMOJI,
         CLIPBOARD,
         NUMPAD,
+        CUSTOM1,
+        CUSTOM2,
+        CUSTOM3,
+        CUSTOM4,
+        CUSTOM5;
+
+        val isCustom: Boolean get() = this == CUSTOM1 || this == CUSTOM2 || this == CUSTOM3 || this == CUSTOM4 || this == CUSTOM5
     }
 
     private enum class ShiftMode {