Align the keyboards, candidate surfaces and toolbar with the reference skin

.github/workflows/release.yml

@@ -257,11 +257,11 @@ jobs:
             channel_flags=(--prerelease)
             latest_flag=--latest=false
           fi
-          # The full and lite APKs are the assets; their SHA-256 and the signing certificate
+          # The -llm and plain APKs are the assets; their SHA-256 and the signing certificate
           # are in the release notes, and the licenses ship inside the APK.
           gh release create "$GITHUB_REF_NAME" \
-            release-files/openIME-*-arm64-release.apk \
-            release-files/openIME-*-arm64-lite-release.apk \
+            release-files/openIME-llm-v*.apk \
+            release-files/openIME-v*.apk \
             --repo "$GITHUB_REPOSITORY" \
             --verify-tag \
             --draft \
@@ -270,9 +270,9 @@ jobs:
             --notes-file release-files/RELEASE_NOTES.md
 
           names="$(gh release view "$GITHUB_REF_NAME" --repo "$GITHUB_REPOSITORY" --json assets --jq '.assets[].name' | sort)"
-          wanted="$(printf 'openIME-%s-arm64-lite-release.apk\nopenIME-%s-arm64-release.apk\n' "$GITHUB_REF_NAME" "$GITHUB_REF_NAME" | sort)"
+          wanted="$(printf 'openIME-%s.apk\nopenIME-llm-%s.apk\n' "$GITHUB_REF_NAME" "$GITHUB_REF_NAME" | sort)"
           if [[ "$names" != "$wanted" ]]; then
-            echo "::error::Expected the full and the lite APK as release assets; the draft was left unpublished."
+            echo "::error::Expected the -llm and the plain APK as release assets; the draft was left unpublished."
             echo "found:"
             echo "$names"
             exit 1

README.md

@@ -80,11 +80,12 @@ The app has no `INTERNET` permission, so your text cannot leave the phone.
 ## Install
 
 1. Open [Releases](https://github.com/Slacker-LLC/openIME/releases).
-   Download the latest `openIME-v*-arm64-release.apk`.
+   Download `openIME-llm-v*.apk` for the build that carries the offline voice
+   models, or `openIME-v*.apk` for the smaller build that has none.
 2. Check the SHA-256 checksum that the release notes show:
 
    ```bash
-   sha256sum openIME-v*-arm64-release.apk
+   sha256sum openIME-llm-v*.apk
    ```
 
 3. Install the APK.

README.zh-CN.md

@@ -59,12 +59,12 @@ openIME 是一款独立的 Android 系统输入法。拼音候选、用户词库
 
 ## 下载与安装
 
-1. 在 [Releases](https://github.com/Slacker-LLC/openIME/releases) 下载最新的 `openIME-v*-arm64-release.apk`。
+1. 在 [Releases](https://github.com/Slacker-LLC/openIME/releases) 下载：带离线语音模型的 `openIME-llm-v*.apk`，或是不含模型的小体积版本 `openIME-v*.apk`。
    发布包仅支持 `arm64-v8a` 设备（绝大多数近年的 Android 手机），系统要求 Android 8.0（API 26）及以上。
 2. 对照发布说明里的 SHA-256 校验后再安装：
 
    ```bash
-   sha256sum openIME-v*-arm64-release.apk
+   sha256sum openIME-llm-v*.apk
    ```
 
 3. 打开 openIME，按引导启用输入法并切换到 openIME。

THIRD_PARTY_NOTICES.md

@@ -14,13 +14,14 @@ This file covers only the third-party components.
 | sherpa-onnx Android runtime | `app/libs/sherpa-onnx-1.13.6.aar` | https://github.com/k2-fsa/sherpa-onnx | Apache-2.0 | The APK contains `assets/licenses/sherpa-onnx-Apache-2.0.txt`. |
 | Streaming Paraformer bilingual (Chinese and English) INT8 model | `app/src/main/assets/models/voice/bilingual-paraformer/` | https://huggingface.co/csukuangfj/sherpa-onnx-streaming-paraformer-bilingual-zh-en | Apache-2.0 | The APK contains only `encoder.int8.onnx`, `decoder.int8.onnx` and `tokens.txt`. `assets/licenses/paraformer-model-Apache-2.0.txt` is included. `manifest.json` pins the model ID, the version and the file hashes. |
 | CT-Transformer punctuation INT8 model | `app/src/main/assets/models/voice/punctuation/` | https://modelscope.cn/models/iic/punc_ct-transformer_zh-cn-common-vocab272727-pytorch and https://github.com/k2-fsa/sherpa-onnx/releases/tag/punctuation-models | Apache-2.0 | We pin the `2024-04-12-int8` export. The manifest lists the file hashes. The APK contains `ct-transformer-Apache-2.0.txt`. |
+| Apache Commons Compress | `org.apache.commons:commons-compress:1.27.1` (Maven) | https://commons.apache.org/proper/commons-compress/ | Apache-2.0 | Imported to read the bzip2 archives the official sherpa-onnx voice-model releases ship. The APK contains `assets/licenses/commons-compress-Apache-2.0.txt` (the artifact's own `META-INF/NOTICE.txt` and `META-INF/LICENSE.txt`). |
 | Microsoft Fluent Emoji | `app/src/main/assets/emoji/fluent/` | https://github.com/microsoft/fluentui-emoji | MIT | The APK has only the emoji images that the app uses. It contains `assets/licenses/fluent-emoji-MIT.txt`. |
 
 ## Checks before a release
 
 - Do not delete `LICENSE`, `COPYING`, `AUTHORS` or `NOTICE` files from vendored source directories.
 - Keep the license texts in `app/src/main/assets/licenses/` in the APK.
-  This includes Rime Ice, librime, OpenCC, Snappy, sherpa-onnx, the Paraformer model and Fluent Emoji.
+  This includes Rime Ice, librime, OpenCC, Snappy, sherpa-onnx, Apache Commons Compress, the Paraformer model and Fluent Emoji.
 - When you update the voice runtime or a model, check the license of the new version.
   Do not rely on the earlier result.
 - When the dictionary source or its pinned commit changes, update this file, [docs/LICENSING.md](docs/LICENSING.md) and the license files in the APK.

VERSION

@@ -1 +1 @@
-0.0.10-beta.1
+1.0.0

app/build.gradle.kts

@@ -72,7 +72,9 @@ android {
     ndkVersion = "27.0.12077973"
 
     defaultConfig {
-        applicationId = "llc.slacker.openime"
+        // A side-by-side development build (the owner's phone runs the .dev
+        // variant) passes -PopenimeAppIdSuffix=.dev; release builds never do.
+        applicationId = "llc.slacker.openime" + ((findProperty("openimeAppIdSuffix") as String?) ?: "")
         minSdk = 26
         targetSdk = 36
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -212,6 +214,10 @@ androidComponents {
 
 dependencies {
     implementation(files("libs/sherpa-onnx-1.13.6.aar"))
+    // The official sherpa-onnx voice-model archives ship as tar.bz2, and the
+    // platform ships no bzip2 decoder (`java.util.zip` has zip/gzip only), so
+    // the import needs one from here.
+    implementation("org.apache.commons:commons-compress:1.27.1")
     testImplementation("junit:junit:4.13.2")
     testImplementation("org.json:json:20260814")
     androidTestImplementation("androidx.test.ext:junit:1.3.0")

app/src/androidTest/java/llc/slacker/openime/AuditInteractionInstrumentedTest.kt

@@ -32,9 +32,11 @@ import llc.slacker.openime.voice.VoiceRecognitionEvents
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNotSame
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertSame
 import org.junit.Assert.assertTrue
+import org.junit.Assume.assumeTrue
 import org.junit.Test
 import org.junit.runner.RunWith
 import java.lang.reflect.Proxy
@@ -653,10 +655,11 @@ class AuditInteractionInstrumentedTest {
             keyboard.showPanel(Panel.TOOLS)
             val card = keyboard.findViewWithTag<View>("tool:表情")
             assertTrue("Tool card must be keyboard-focusable", card.isFocusable)
-            // The column is the target; its icon tile mirrors the column's state.
-            val tile = (card as ViewGroup).getChildAt(0)
-            assertTrue("Tool tile must expose pressed and focus feedback", tile.background is StateListDrawable)
-            assertTrue("Tool tile must follow the card's pressed state", tile.isDuplicateParentStateEnabled)
+            // The whole cell is the reference's own tile: it carries the face and
+            // the press, and its glyph mirrors the tile's state.
+            assertTrue("Tool tile must expose pressed and focus feedback", card.background is StateListDrawable)
+            val icon = (card as ViewGroup).getChildAt(0)
+            assertTrue("Tool glyph must follow the tile's pressed state", icon.isDuplicateParentStateEnabled)
             assertEquals("表情", card.contentDescription)
             val label = card.getChildAt(1)
             assertTrue(
@@ -919,7 +922,8 @@ class AuditInteractionInstrumentedTest {
     @Test
     fun modeSwitchDismissesLongPressChoicePopup() = withKeyboard { harness, _, keyboard ->
         harness.awaitMain {
-            // 1 is the nine-key segmentation key; its long press offers @ # /.
+            // The nine-key 1 cell is the @# key: its long press offers the
+            // reference's own symbol list.
             keyboard.setMode(KeyboardMode.PINYIN_9, notifyListener = false)
             val segment = keyboard.findViewWithTag<View>("key-9:1")
             val baseline = keyboard.childCount
@@ -1174,6 +1178,7 @@ class AuditInteractionInstrumentedTest {
         var downTime = 0L
         var released = false
         var spaceViewSurvivedRebuildPoll = false
+        var starvedPastLongPress = false
         lateinit var spaceKey: View
         val releaseDelayMs = minOf(
             100L,
@@ -1201,6 +1206,12 @@ class AuditInteractionInstrumentedTest {
             // Give the deferred row rebuild poll several main-loop turns, but
             // release before Android's own long-click can consume this tap.
             keyboard.postDelayed({
+                // 机器卡顿时这个回调会晚到：一旦越过长按阈值，平台就不再把它当点击
+                // （`View.onTouchEvent` 置了 `mHasPerformedLongPress` 后不再发 click），
+                // 这颗键按设计就是语音而空格。这条断言在那种时间线下没有意义，跳过而不是
+                // 报错——否则 CI 越忙越"红"。
+                starvedPastLongPress =
+                    SystemClock.uptimeMillis() - downTime >= ViewConfiguration.getLongPressTimeout().toLong()
                 spaceViewSurvivedRebuildPoll =
                     keyboard.findViewWithTag<View>("key-space") === spaceKey
                 val point = keyPoint(keyboard, "key-space")
@@ -1210,6 +1221,10 @@ class AuditInteractionInstrumentedTest {
             true
         }
         harness.awaitMain(timeoutMs = 3_000L) { if (released) true else null }
+        assumeTrue(
+            "The main thread ran past the long-press deadline, so this press is a voice hold, not a tap",
+            !starvedPastLongPress,
+        )
         harness.awaitMain {
             assertTrue(
                 "The Space view must remain attached while the rebuild poll sees the active touch",
@@ -1222,6 +1237,65 @@ class AuditInteractionInstrumentedTest {
         assertEquals("A rebuild during the press must not swallow the space", 1, recorder.spaces)
     }
 
+    @Test
+    fun aPressLeftWithoutAFingerOnlyDefersWhileTheFingerIsStillDown() = withKeyboard { harness, _, keyboard ->
+        // Half by half: the deferral (see rebuildWhileSpaceIsHeldDoesNotSwallowTheSpace)
+        // must protect a real gesture and must not outlive it. A press left behind by
+        // an earlier gesture — the rebuild that swallowed it, or a view swapped out
+        // mid-gesture — used to defer every later rebuild and poll for it forever.
+        val releaseDelayMs = minOf(
+            100L,
+            (ViewConfiguration.getLongPressTimeout().toLong() / 2L).coerceAtLeast(1L),
+        )
+        lateinit var staleSpace: View
+        harness.awaitMain {
+            staleSpace = requireNotNull(keyboard.findViewWithTag("key-space"))
+            staleSpace.isPressed = true
+            true
+        }
+        harness.awaitMain {
+            keyboard.setMode(KeyboardMode.ENGLISH_26, notifyListener = false)
+            val rebuilt = keyboard.findViewWithTag<View>("key-space")
+            assertNotNull("The mode switch must rebuild the rows of the new layout", rebuilt)
+            assertNotSame(
+                "A press with no finger on the screen must not defer this rebuild",
+                staleSpace,
+                rebuilt,
+            )
+            assertFalse("The deferred rebuild must let go of the stale key", staleSpace.isAttachedToWindow)
+            true
+        }
+
+        // A finger really on the screen: the deferral still holds, and the rebuild
+        // lands as soon as that finger lifts.
+        var released = false
+        var downTime = 0L
+        lateinit var heldSpace: View
+        harness.awaitMain {
+            val point = keyPoint(keyboard, "key-space")
+            heldSpace = requireNotNull(keyboard.findViewWithTag("key-space"))
+            downTime = SystemClock.uptimeMillis()
+            pointers(keyboard, downTime, MotionEvent.ACTION_DOWN, listOf(point))
+            assertTrue("Space must own the active press", heldSpace.isPressed)
+            keyboard.setMode(KeyboardMode.PINYIN_26, notifyListener = false)
+            assertSame(
+                "A live finger must still defer the rebuild",
+                heldSpace,
+                keyboard.findViewWithTag<View>("key-space"),
+            )
+            keyboard.postDelayed({
+                pointers(keyboard, downTime, MotionEvent.ACTION_UP, listOf(point))
+                released = true
+            }, releaseDelayMs)
+            true
+        }
+        harness.awaitMain(timeoutMs = 3_000L) { if (released) true else null }
+        // The rebuild poll runs on a 40ms cadence; give it a few turns.
+        harness.awaitMain(timeoutMs = 3_000L) {
+            keyboard.findViewWithTag<View>("key-space")?.takeIf { it !== heldSpace }
+        }
+    }
+
     @Test
     fun backspaceTapDeletesExactlyOnceAndCancelDeletesNothing() = withKeyboard { harness, recorder, keyboard ->
         harness.awaitMain {