Merge "Auto finish composing text when A11yIME commits text" into tm-dev

2022-04-21 09:58:58 +00:00
parent 7391919a15 d92f3fca74
commit 54a8dee16d
1 changed files with 4 additions and 0 deletions
--- a/core/java/com/android/internal/inputmethod/RemoteInputConnectionImpl.java
+++ b/core/java/com/android/internal/inputmethod/RemoteInputConnectionImpl.java
@@ -1065,7 +1065,11 @@ public final class RemoteInputConnectionImpl extends IInputContext.Stub {
                    Log.w(TAG, "commitText on inactive InputConnection");
                    return;
                }
+                // A11yIME's commitText() also triggers finishComposingText() automatically.
+                ic.beginBatchEdit();
+                ic.finishComposingText();
                ic.commitText(text, newCursorPosition, textAttribute);
+                ic.endBatchEdit();
            });
        }