Merge upstream LeanType v3.8.8 before 3.10.0 release

CHANGELOG.md

@@ -22,6 +22,8 @@ and this project uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 - **Auto-read OTP from SMS** — a one-time code from an incoming SMS is offered in the suggestion
   strip while the keyboard is open; tap to insert. Uses a runtime, opt-in SMS permission.
 - **Regex shortcuts in Text Expander** — expansion triggers can be matched by regular expression.
+- **Dynamic dictionary/plugin downloader** — Standard builds can fetch layout dictionaries, emoji dictionaries, and handwriting plugins on demand.
+- **Selective backup and restore** — backup/restore settings, dictionaries, and AI prompt configuration more granularly.
 
 ### Changed
 - **Offline AI backend switched from ONNX Runtime to llama.cpp (GGUF).** The Offline build now
@@ -31,11 +33,19 @@ and this project uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
   navigation, space, copy/paste, cut/select-all, undo/redo, hold-to-backspace). Single-finger
   double-tap now **selects the word** (previously deleted the selection).
 - Release builds now target the **arm64-v8a** ABI only.
+- Standard builds now exclude non-en-US dictionary assets and download optional dictionaries dynamically.
+
+### Fixed
+- **Sticky Shift from upstream handwriting cleanup** — upstream v3.8.6 stopped the hidden handwriting
+  bottom row on every keyboard-frame switch, which globally cancelled the active Shift pointer before
+  release. We keep the upstream handwriting feature but only stop handwriting when it is actually
+  shown. (Upstream bug LeanBitLab/LeanType#186; upstream PR #194.)
 
 ### Upstream
-- Merged **LeanBitLab/LeanType v3.8.6** (from v3.8.3) — the source of the handwriting,
-  llama.cpp/GGUF, touchpad-gesture, and SMS-OTP changes above. Fork identity (LeanTypeDual, distinct
-  `applicationId`, two-thumb typing, the Gemini standard-AI layer, and the privacy tiers) is
+- Merged **LeanBitLab/LeanType v3.8.8** (from v3.8.3, including v3.8.7 and two post-tag docs/badge
+  commits) — the source of the handwriting, llama.cpp/GGUF, dynamic downloader, touchpad-gesture,
+  SMS-OTP, selective-backup, and dictionary-downloader changes above. Fork identity (LeanTypeDual,
+  distinct `applicationId`, two-thumb typing, the Gemini standard-AI layer, and the privacy tiers) is
   preserved.
 
 ## [3.9.1] - 2026-06-11

README.md

@@ -30,13 +30,16 @@ Type with **both thumbs gliding at the same time**: LeanTypeDual aggregates mult
 - **🧠 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.
 - **↩️ Undo word** - a toolbar key that reverts the last committed word back to its suggestion alternatives.
 - **🗂️ Per-dictionary control** - enable or disable individual built-in and custom dictionaries.
+- **📥 Dynamic Downloader** - Standard builds can download layout dictionaries, emoji dictionaries, and handwriting plugins on demand, keeping the initial app smaller.
 - **🪟 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.
 - **🎨 Modern UI** - "Squircle" key backgrounds, refined icons, and polished aesthetics.
 - **🔄 Google Dictionary Import** - Import your personal dictionary words.
 - **🔍 Clipboard Search & Undo** - Search clipboard history from the toolbar, undo accidental deletions, and fold pinned items by default.
 - **📸 Screenshot Suggestion & Clipboard** - Recently-taken screenshots are offered in the suggestion strip and saved to clipboard history.
+- **✉️ Auto-Read OTP** - Incoming one-time codes can appear in the suggestion strip for quick insertion.
+- **💾 Selective Backup & Restore** - Backup and restore settings, dictionaries, and AI prompt configuration selectively.
 - **🔎 Emoji Search** - Search emojis by name. *Requires loading an Emoji Dictionary.*
 - **⚙️ Enhanced Customization** - Force auto-capitalization, fine-grained haptics, distinct incognito icon, reorganized settings, and more.
 - **🔒 Privacy Choices** - Choose **Standard** (opt-in AI, handwriting), **Offline** (network hard-disabled, offline GGUF model), or **Offline Lite** (no AI, ~20 MB).

app/build.gradle.kts

@@ -36,9 +36,7 @@ android {
     productFlavors {
         create("standard") {
             dimension = "privacy"
-        }
-        create("standardOptimised") {
-            dimension = "privacy"
+            minSdk = 23
         }
         create("offline") {
             dimension = "privacy"
@@ -106,7 +104,6 @@ android {
                 "standard" -> "1"
                 "offline" -> "2"
                 "offlinelite" -> "3"
-                "standardOptimised" -> "4"
                 else -> ""
             }
             if (number.isNotEmpty()) {
@@ -119,13 +116,28 @@ android {
         }
         // got a little too big for GitHub after some dependency upgrades, so we remove the largest dictionary
         androidComponents.onVariants { variant: ApplicationVariant ->
+            val patterns = mutableListOf<String>()
             if (variant.buildType == "debug") {
-                variant.androidResources.ignoreAssetsPatterns = listOf("main_ro.dict")
+                patterns.add("main_ro.dict")
                 variant.proguardFiles = emptyList()
                 //noinspection ProguardAndroidTxtUsage we intentionally use the "normal" file here
                 variant.proguardFiles.add(project.layout.buildDirectory.file(getDefaultProguardFile("proguard-android.txt").absolutePath))
                 variant.proguardFiles.add(project.layout.buildDirectory.file(project.buildFile.parent + "/proguard-rules.pro"))
             }
+            if (variant.flavorName == "standard") {
+                // ponytail: dynamically find all dict files to ignore in standard flavor except main_en-US.dict
+                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") {
+                            patterns.add(file.name)
+                        }
+                    }
+                }
+            }
+            if (patterns.isNotEmpty()) {
+                variant.androidResources.ignoreAssetsPatterns = patterns
+            }
         }
     }
 
@@ -194,14 +206,6 @@ android {
         // these orphaned strings are harmlessly stripped by R8 during minification.
         disable += "ExtraTranslation"
     }
-
-    sourceSets {
-        getByName("standardOptimised") {
-            java.srcDirs("src/standard/java")
-            res.srcDirs("src/standard/res")
-            manifest.srcFile("src/standard/AndroidManifest.xml")
-        }
-    }
 }
 
 dependencies {
@@ -230,8 +234,6 @@ dependencies {
     // gemini ai proofreading
     "standardImplementation"("com.google.ai.client.generativeai:generativeai:0.9.0")
     "standardImplementation"("androidx.security:security-crypto:1.1.0-alpha06") // for encrypted API key storage
-    "standardOptimisedImplementation"("com.google.ai.client.generativeai:generativeai:0.9.0")
-    "standardOptimisedImplementation"("androidx.security:security-crypto:1.1.0-alpha06")
 
     // local llm proofreading (offline)
     "offlineImplementation"("io.github.ljcamargo:llamacpp-kotlin:0.4.0")
@@ -248,7 +250,6 @@ dependencies {
     // ML Kit's internal asset manager and native library loader use the host app context,
     // so the host app must compile and include the client library resources/libraries.
     "standardImplementation"("com.google.mlkit:digital-ink-recognition:19.0.0")
-    "standardOptimisedImplementation"("com.google.mlkit:digital-ink-recognition:19.0.0")
 
     // test
     testImplementation(kotlin("test"))
@@ -267,11 +268,9 @@ dependencies {
     "runTestsImplementation"("androidx.compose.ui:ui-test-manifest")
 }
 
-// Disable baseline/ART profile tasks to guarantee deterministic reproducible builds (except for standardOptimised)
+// Disable baseline/ART profile tasks to guarantee deterministic reproducible builds
 tasks.configureEach {
     if (name.contains("ArtProfile", ignoreCase = true)) {
-        if (!name.contains("StandardOptimised", ignoreCase = true)) {
-            enabled = false
-        }
+        enabled = false
     }
 }

app/proguard-rules.pro

@@ -27,6 +27,8 @@
 
 # Keep java-llama.cpp classes
 -keep class de.kherud.llama.** { *; }
+-keep class org.nehuatl.llamacpp.** { *; }
+
 
 
 # Fix correct service name
@@ -36,3 +38,20 @@
 -dontwarn com.google.api.client.**
 -dontwarn java.lang.management.**
 -dontwarn org.joda.time.**
+
+# Keep handwriting plugin interface and listener to prevent parameter removal/signature optimization
+-keep interface helium314.keyboard.latin.handwriting.HandwritingRecognizer {
+    <methods>;
+}
+-keep interface helium314.keyboard.latin.handwriting.ModelDownloadListener {
+    <methods>;
+}
+
+# Keep ML Kit, GMS Tasks, and Firebase components for handwriting plugin dynamic linkage
+-keep class com.google.mlkit.** { *; }
+-keep class com.google.android.gms.tasks.** { *; }
+-keep class com.google.firebase.components.** { *; }
+
+# Keep Kotlin standard library for dynamically loaded plugins
+# ponytail: keep kotlin stdlib classes to prevent NoSuchMethodError in plugin loading
+-keep class kotlin.** { *; }

app/src/main/assets/layouts/number_row/number_row.json

@@ -1,44 +1,14 @@
-[
-    [
-      { "$": "shift_state_selector",
-        "manualOrLocked": { "label": "!" },
-        "default": { "label": "1", "popup": { "relevant": [{ "label": "¹" }, { "label": "½" }, { "label": "⅓" }, { "label": "¼" }, { "label": "⅛" }] } }
-      },
-      { "$": "shift_state_selector",
-        "manualOrLocked": { "label": "@" },
-        "default": { "label": "2", "popup": { "relevant": [{ "label": "²" }, { "label": "⅔" }] } }
-      },
-      { "$": "shift_state_selector",
-        "manualOrLocked": { "label": "#" },
-        "default": { "label": "3", "popup": { "relevant": [{ "label": "³" }, { "label": "¾" }, { "label": "⅜" }] } }
-      },
-      { "$": "shift_state_selector",
-        "manualOrLocked": { "label": "$" },
-        "default": { "label": "4", "popup": { "relevant": [{ "label": "⁴" }] } }
-      },
-      { "$": "shift_state_selector",
-        "manualOrLocked": { "label": "%" },
-        "default": { "label": "5", "popup": { "relevant": [{ "label": "⁵" }, { "label": "⅝" }] } }
-      },
-      { "$": "shift_state_selector",
-        "manualOrLocked": { "label": "^" },
-        "default": { "label": "6", "popup": { "relevant": [{ "label": "⁶" }] } }
-      },
-      { "$": "shift_state_selector",
-        "manualOrLocked": { "label": "&" },
-        "default": { "label": "7", "popup": { "relevant": [{ "label": "⁷" }, { "label": "⅞" }] } }
-      },
-      { "$": "shift_state_selector",
-        "manualOrLocked": { "label": "*" },
-        "default": { "label": "8", "popup": { "relevant": [{ "label": "⁸" }] } }
-      },
-      { "$": "shift_state_selector",
-        "manualOrLocked": { "label": "(" },
-        "default": { "label": "9", "popup": { "relevant": [{ "label": "⁹" }] } }
-      },
-      { "$": "shift_state_selector",
-        "manualOrLocked": { "label": ")" },
-        "default": { "label": "0", "popup": { "relevant": [{ "label": "⁰" }, { "label": "ⁿ" }, { "label": "∅" }] } }
-      }
-    ]
-  ]
+[
+    [
+        { "label": "1", "popup": { "relevant": [{ "label": "!" }, { "label": "¹" }, { "label": "½" }, { "label": "⅓" }, { "label": "¼" }, { "label": "⅛" }] } },
+        { "label": "2", "popup": { "relevant": [{ "label": "@" }, { "label": "²" }, { "label": "⅔" }] } },
+        { "label": "3", "popup": { "relevant": [{ "label": "#" }, { "label": "³" }, { "label": "¾" }, { "label": "⅜" }] } },
+        { "label": "4", "popup": { "relevant": [{ "label": "$" }, { "label": "⁴" }] } },
+        { "label": "5", "popup": { "relevant": [{ "label": "%" }, { "label": "⁵" }, { "label": "⅝" }] } },
+        { "label": "6", "popup": { "relevant": [{ "label": "^" }, { "label": "⁶" }] } },
+        { "label": "7", "popup": { "relevant": [{ "label": "&" }, { "label": "⁷" }, { "label": "⅞" }] } },
+        { "label": "8", "popup": { "relevant": [{ "label": "*" }, { "label": "⁸" }] } },
+        { "label": "9", "popup": { "relevant": [{ "label": "(" }, { "label": "⁹" }] } },
+        { "label": "0", "popup": { "relevant": [{ "label": ")" }, { "label": "⁰" }, { "label": "ⁿ" }, { "label": "∅" }] } }
+    ]
+]

app/src/main/java/helium314/keyboard/keyboard/TouchpadView.java

@@ -376,6 +376,8 @@ private void setupTouchSurface() {
                     mIsTwoFingerTap = false;
                     removeCallbacks(mTwoFingerLongPressRunnable);
                     mIsTwoFingerLongPress = false;
+                    mTwoFingerTapCount = 0;
+                    removeCallbacks(mTwoFingerTapRunnable);
                     if (mSelectionMode) {
                         mSelectionMode = false;
                         applySurfaceColor();
@@ -385,6 +387,7 @@ private void setupTouchSurface() {
                 case MotionEvent.ACTION_CANCEL:
                     android.util.Log.i("TouchpadView", "ACTION_CANCEL");
                     mIsDragging = false;
+                    stopEdgeScrolling();
                     mIsTwoFingerScroll = false;
                     mIsTwoFingerTap = false;
                     removeCallbacks(mTwoFingerLongPressRunnable);