fix(android): 简化 Android 虚拟按键设置

Author: std-microblock

android/runtime/MOD_TOUCH.md

@@ -44,9 +44,9 @@ best-effort, with the existing **按键 / 触屏** fallback.
   still be configured on the launcher's custom **按键** page. This change does not
   implement a touch version of the gamepad emote wheel or player-list row actions.
 
-Default gameplay shortcuts require gameplay buttons enabled and a usable keyboard
-binding; both touch preferences off remain off. Direct chat/map menus also work
-with joystick-only controls. Custom semantic buttons can target unbound Mod actions.
+Default gameplay shortcuts require virtual keys enabled and a usable keyboard
+binding. Direct chat/map menus also work with the virtual-key switch enabled.
+Custom semantic buttons can target unbound Mod actions.
 
 ## Verification
 

android/runtime/TOUCH_CONTROLS.md

@@ -39,9 +39,9 @@ one-tap resume.
   startup. If the native text keyboard is open, Back dismisses it first. During
   startup it retains the cancel-launch confirmation.
 - The top-left edit button and adjacent exit icon are fixed. Exit **always asks for confirmation** and is
-  available even when both touch options are off. It does not save the game for you.
-- Enabling only the stick still provides complete menu navigation and confirmation.
-  Disabling both options leaves only edit/exit; other touches pass through.
+  available even when virtual keys are off. It does not save the game for you.
+- The **显示虚拟按键** switch controls the complete touch overlay, including gameplay actions and
+  direction controls. When it is off, only edit/exit remain and other touches pass through.
 - Bindings are read from `Celeste.Input` and `Settings`, including menu directions,
   gameplay movement, interaction and Pause. Supported keyboard bindings use their
   first Android-representable key. Only missing metadata (e.g. an unavailable hook)
@@ -126,7 +126,7 @@ one-tap resume.
 - In the gameplay layout editor, tap the stick or any direction button to choose
   **固定摇杆 / 浮动摇杆 / 四键按钮 / 八键按钮**. The eight-button layout adds four explicit diagonal
   buttons around an empty center. Menus retain cardinal-only navigation. Existing
-  launcher enable/disable switches are respected; an unset mode follows the old
+  launcher virtual-key switch is respected; an unset mode follows the old
   joystick preference. Switching modes preserves the hidden controls' positions
   and styles so switching back is non-destructive.
 - **浮动摇杆** starts anywhere in the left half of the overlay, below the
@@ -307,7 +307,7 @@ verify play icon, D-pad and bottom-right confirm; open options and verify back i
 resume via both play icon and Android Back; hold climb while entering Talk range;
 hold movement while opening pause and verify no stuck selection; background/return;
 test journal, naming, dialogue, two-finger gameplay, fast taps, controller-opened
-menus, and both touch preference combinations. Exit only through the confirmed
+menus, and with virtual keys both enabled and disabled. Exit only through the confirmed
 manager button or normal game exit. Use test saves for any progress-changing checks.
 For rebinding: move jump/dash/grab/talk/pause and menu confirm/cancel/directions to
 distinct keys; verify both direct touch and virtual navigation. Clear a common
@@ -346,7 +346,7 @@ invalidation, and propagation of original game exceptions.
 
 - Manager settings → Android 游戏运行时 → **跟随游戏震动** (`gameRumble`, default
   false, applied on the next game launch). Existing settings files remain off;
-  partial setting updates preserve all other switches.
+  partial setting updates preserve the virtual-key switch.
 - A managed detour observes `FNA GamePad.SetVibration(PlayerIndex, float, float)`
   after the original call, including when it returns false because no physical
   controller is attached. Celeste's own rumble off/half/full setting, timing,
@@ -374,6 +374,6 @@ invalidation, and propagation of original game exceptions.
   last 20 ms, and the motor must receive distinct amplitudes rather than different
   durations. Actual perceptual separation must be checked on the device.
   Device smoke checks: enable
-  with both touch controls off; trigger dash/landing rumble without a gamepad; check
+  with virtual keys off; trigger dash/landing rumble without a gamepad; check
   half/off in the game's settings; combine touch pulses; background and return;
   disable and relaunch. Physical controller rumble should remain unchanged.

android/runtime/src/com/celemod/runtime/RuntimePlugin.kt

@@ -75,9 +75,12 @@ class RuntimePlugin(private val activity: Activity) : Plugin(activity) {
 
     @Command fun info(invoke: Invoke) {
         val result = JSObject()
+        // The gameplay buttons and direction controls are one virtual-keyboard
+        // switch. Keep accepting the old settings file format and treat either
+        // legacy flag as enabling the overlay.
+        val touchEnabled = settings().optBoolean("buttons", false) || settings().optBoolean("joystick", false)
         result.put("gameRoot", root().absolutePath)
-        result.put("buttons", settings().optBoolean("buttons", false))
-        result.put("joystick", settings().optBoolean("joystick", false))
+        result.put("joystick", touchEnabled)
         result.put("gameRumble", settings().optBoolean("gameRumble", false))
         result.put("runtime", "RotatingArtLauncher 2.1.1 / CoreCLR 10.0.4")
         invoke.resolve(result)
@@ -87,9 +90,13 @@ class RuntimePlugin(private val activity: Activity) : Plugin(activity) {
         try {
             val args = invoke.getArgs()
             val value = settings()
-            for (key in arrayOf("buttons", "joystick", "gameRumble")) {
-                if (args.has(key) && !args.isNull(key)) value.put(key, args.getBoolean(key))
+            if (args.has("joystick") && !args.isNull("joystick")) {
+                val enabled = args.getBoolean("joystick")
+                value.put("joystick", enabled)
+                // Keep the legacy field in sync for older game processes.
+                value.put("buttons", enabled)
             }
+            if (args.has("gameRumble") && !args.isNull("gameRumble")) value.put("gameRumble", args.getBoolean("gameRumble"))
             val temp = File(activity.filesDir, "android-controls.json.tmp")
             temp.writeText(value.toString())
             check(temp.renameTo(settingsFile())) { "Cannot save control settings" }
@@ -174,12 +181,13 @@ class RuntimePlugin(private val activity: Activity) : Plugin(activity) {
                     SteamBridge.beforeLaunch(activity.applicationContext, path)
                     SteamBridge.launchStage = "preparing"
                     RuntimeHost.prepare(activity)
+                    val touchEnabled = settings().optBoolean("buttons", false) || settings().optBoolean("joystick", false)
                     val intent = Intent(activity, GameActivity::class.java)
                         .putExtra("path", path.absolutePath)
                         .putExtra("origin", args.optBoolean("origin"))
                         .putExtra("legacyLoader", args.optBoolean("legacyLoader"))
-                        .putExtra("buttons", settings().optBoolean("buttons"))
-                        .putExtra("joystick", settings().optBoolean("joystick"))
+                        .putExtra("buttons", touchEnabled)
+                        .putExtra("joystick", touchEnabled)
                         .putExtra("gameRumble", settings().optBoolean("gameRumble", false))
                     SteamBridge.launchStage = "starting"
                     activity.runOnUiThread {

src-tauri/src/android.rs

@@ -60,10 +60,10 @@ pub fn steam(request: serde_json::Value) -> anyhow::Result<serde_json::Value> {
         .run_mobile_plugin("steam", request)?)
 }
 
-pub fn settings(buttons: Option<bool>, joystick: Option<bool>, game_rumble: Option<bool>) -> anyhow::Result<serde_json::Value> {
+pub fn settings(joystick: Option<bool>, game_rumble: Option<bool>) -> anyhow::Result<serde_json::Value> {
     let handle = RUNTIME.get().ok_or_else(|| anyhow::anyhow!("Android runtime is not initialized"))?;
-    Ok(if buttons.is_some() || joystick.is_some() || game_rumble.is_some() {
-        handle.run_mobile_plugin("configure", serde_json::json!({"buttons": buttons, "joystick": joystick, "gameRumble": game_rumble}))?
+    Ok(if joystick.is_some() || game_rumble.is_some() {
+        handle.run_mobile_plugin("configure", serde_json::json!({"joystick": joystick, "gameRumble": game_rumble}))?
     } else { handle.run_mobile_plugin("info", ())? })
 }
 

src-tauri/src/backend.rs

@@ -4332,12 +4332,12 @@ async fn android_steam(request: serde_json::Value) -> Result<serde_json::Value,
 }
 
 #[tauri::command]
-async fn android_runtime_settings(buttons: Option<bool>, joystick: Option<bool>, game_rumble: Option<bool>) -> Result<serde_json::Value, String> {
+async fn android_runtime_settings(joystick: Option<bool>, game_rumble: Option<bool>) -> Result<serde_json::Value, String> {
     #[cfg(target_os = "android")]
-    return tauri::async_runtime::spawn_blocking(move || crate::android::settings(buttons, joystick, game_rumble)).await
+    return tauri::async_runtime::spawn_blocking(move || crate::android::settings(joystick, game_rumble)).await
         .map_err(|e| e.to_string())?.map_err(|e| format!("{e:#}"));
     #[cfg(not(target_os = "android"))]
-    { let _ = (buttons, joystick, game_rumble); Err("Android only".into()) }
+    { let _ = (joystick, game_rumble); Err("Android only".into()) }
 }
 
 #[tauri::command]

src/celemod-ui/src/components/AndroidRuntime.tsx

@@ -7,7 +7,7 @@ import { Icon } from "./Icon";
 import { SteamAccount } from "./SteamAccount";
 import { AndroidLogs } from "./AndroidLogs";
 
-type RuntimeSettings = { gameRoot: string; runtime: string; buttons: boolean; joystick: boolean; gameRumble: boolean };
+type RuntimeSettings = { gameRoot: string; runtime: string; joystick: boolean; gameRumble: boolean };
 
 export function AndroidRuntime() {
   const [gamePath] = useGamePath();
@@ -19,7 +19,7 @@ export function AndroidRuntime() {
   useEffect(() => {
     invoke<RuntimeSettings>("android_runtime_settings").then(setSettings).catch(e => setError(String(e)));
   }, []);
-  async function update(key: "buttons" | "joystick" | "gameRumble", value: boolean) {
+  async function update(key: "joystick" | "gameRumble", value: boolean) {
     if (!settings) return;
     setSaving(true); setError("");
     try {
@@ -54,17 +54,12 @@ export function AndroidRuntime() {
         <button disabled={!gamePath || saving} onClick={() => void importPackage()}>导入 Mod / Everest ZIP</button>
       </div>
       <label className="setting-toggle-row">
-        <span><strong>智能屏幕按键</strong><small>游玩时显示跳跃 / 冲刺 / 抓取，菜单自动切换确定 / 返回；跟随游戏键位，默认关闭。</small></span>
-        <input type="checkbox" checked={settings?.buttons ?? false} disabled={!settings || saving}
-          onChange={e => void update("buttons", e.target.checked)} />
-      </label>
-      <label className="setting-toggle-row">
-        <span><strong>屏幕方向控制</strong><small>默认使用固定八向摇杆；游戏内「编辑」可切换固定 / 浮动摇杆、四键 / 八键按钮，选择八分圆环显示。四键 / 八键可选择独立按钮或合并成方向盘整体排版，并调整死区、震动和大小（最高 300%）。菜单使用四向方向键，默认关闭。</small></span>
+        <span><strong>显示虚拟按键</strong></span>
         <input type="checkbox" checked={settings?.joystick ?? false} disabled={!settings || saving}
           onChange={e => void update("joystick", e.target.checked)} />
       </label>
       <div className="theme-setting"><div className="setting-description">
-        <small>设置在下次启动游戏时生效。屏幕按键和方向控制均关闭时可使用实体手柄或键盘。游戏内安卓返回键 / 返回手势等同 Esc；左上角退出图标可返回管理器，启动过程中返回键可取消启动。</small>
+        <small>设置在下次启动游戏时生效。关闭虚拟按键时可使用实体手柄或键盘。游戏内安卓返回键 / 返回手势等同 Esc；左上角退出图标可返回管理器，启动过程中返回键可取消启动。</small>
         <small>游戏内点左上角「编辑」，再轻点摇杆 / 方向键切换模式，轻点各按钮设置进入 / 离开震动、独立震动强度和不透明度（Opacity）；保存后生效，横竖屏分别记忆。</small>
         {error && <p role="alert">{error}</p>}
       </div></div>