Fix: hardware keyboard append doesn't work when there is composition

Developers reported that when TextField has an active composition,
inserting from hardware keyboard doesn't work correctly. Instead of
appending the character after the cursor, the newly inserted character
will replace the entire composing text. This conflicts with the behavior
on software keyboard.
Fully fix the issue needs careful design and much more work.
This CL only provides a simple workaround: if the input is from hardware
keyaboard, we always finalize the current composition before commiting
the new change.

Bug: 188102001
Test: ./gradlew test
Test: manually tested within demo App
Change-Id: I5aa09229c40ee780b3ca30af761355dc18791989

Author: Haoyu Zhang

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldKeyInput.kt

@@ -29,6 +29,7 @@ import androidx.compose.ui.input.key.type
 import androidx.compose.ui.input.key.utf16CodePoint
 import androidx.compose.ui.text.input.CommitTextCommand
 import androidx.compose.ui.text.input.EditCommand
+import androidx.compose.ui.text.input.FinishComposingTextCommand
 import androidx.compose.ui.text.input.OffsetMapping
 import androidx.compose.ui.text.input.TextFieldValue
 
@@ -56,7 +57,7 @@ internal class TextFieldKeyInput(
     private val keyMapping: KeyMapping = platformDefaultKeyMapping,
 ) {
     private fun EditCommand.apply() {
-        state.onValueChange(state.processor.apply(listOf(this)))
+        state.onValueChange(state.processor.apply(listOf(FinishComposingTextCommand(), this)))
     }
 
     private fun typedCommand(event: KeyEvent): CommitTextCommand? =

compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/text/input/RecordingInputConnection.android.kt

@@ -213,19 +213,19 @@ internal class RecordingInputConnection(
         }
 
     override fun setSelection(start: Int, end: Int): Boolean = ensureActive {
-        if (DEBUG) { logDebug("setSelection($start, $end") }
+        if (DEBUG) { logDebug("setSelection($start, $end)") }
         addEditCommandWithBatch(SetSelectionCommand(start, end))
         return true
     }
 
     override fun finishComposingText(): Boolean = ensureActive {
-        if (DEBUG) { logDebug("finishComposingText(") }
+        if (DEBUG) { logDebug("finishComposingText()") }
         addEditCommandWithBatch(FinishComposingTextCommand())
         return true
     }
 
     override fun sendKeyEvent(event: KeyEvent): Boolean = ensureActive {
-        if (DEBUG) { logDebug("sendKeyEvent($event") }
+        if (DEBUG) { logDebug("sendKeyEvent($event)") }
         eventCallback.onKeyEvent(event)
         return true
     }
@@ -261,13 +261,13 @@ internal class RecordingInputConnection(
     }
 
     override fun requestCursorUpdates(cursorUpdateMode: Int): Boolean = ensureActive {
-        if (DEBUG) { logDebug("requestCursorUpdates($cursorUpdateMode") }
+        if (DEBUG) { logDebug("requestCursorUpdates($cursorUpdateMode)") }
         Log.w(TAG, "requestCursorUpdates is not supported")
         return false
     }
 
     override fun getExtractedText(request: ExtractedTextRequest?, flags: Int): ExtractedText {
-        if (DEBUG) { logDebug("getExtractedText($request, $flags") }
+        if (DEBUG) { logDebug("getExtractedText($request, $flags)") }
         extractedTextMonitorMode = (flags and InputConnection.GET_EXTRACTED_TEXT_MONITOR) != 0
         if (extractedTextMonitorMode) {
             currentExtractedTextRequestToken = request?.token ?: 0
@@ -296,13 +296,13 @@ internal class RecordingInputConnection(
     // /////////////////////////////////////////////////////////////////////////////////////////////
 
     override fun performContextMenuAction(id: Int): Boolean = ensureActive {
-        if (DEBUG) { logDebug("performContextMenuAction($id") }
+        if (DEBUG) { logDebug("performContextMenuAction($id)") }
         Log.w(TAG, "performContextMenuAction is not supported")
         return false
     }
 
     override fun performEditorAction(editorAction: Int): Boolean = ensureActive {
-        if (DEBUG) { logDebug("performEditorAction($editorAction") }
+        if (DEBUG) { logDebug("performEditorAction($editorAction)") }
         val imeAction = when (editorAction) {
             EditorInfo.IME_ACTION_UNSPECIFIED -> ImeAction.Default
             EditorInfo.IME_ACTION_DONE -> ImeAction.Done
@@ -325,7 +325,7 @@ internal class RecordingInputConnection(
     // /////////////////////////////////////////////////////////////////////////////////////////////
 
     override fun commitCompletion(text: CompletionInfo?): Boolean = ensureActive {
-        if (DEBUG) { logDebug("commitCompletion(${text?.text}") }
+        if (DEBUG) { logDebug("commitCompletion(${text?.text})") }
         // We don't support this callback.
         // The API documents says this should return if the input connection is no longer valid, but
         // The Chromium implementation already returning false, so assuming it is safe to return
@@ -342,12 +342,12 @@ internal class RecordingInputConnection(
     }
 
     override fun getHandler(): Handler? {
-        if (DEBUG) { logDebug("getHandler(") }
+        if (DEBUG) { logDebug("getHandler()") }
         return null // Returns null means using default Handler
     }
 
     override fun clearMetaKeyStates(states: Int): Boolean = ensureActive {
-        if (DEBUG) { logDebug("clearMetaKeyStates($states") }
+        if (DEBUG) { logDebug("clearMetaKeyStates($states)") }
         // We don't support this callback.
         // The API documents says this should return if the input connection is no longer valid, but
         // The Chromium implementation already returning false, so assuming it is safe to return
@@ -357,12 +357,12 @@ internal class RecordingInputConnection(
     }
 
     override fun reportFullscreenMode(enabled: Boolean): Boolean {
-        if (DEBUG) { logDebug("reportFullscreenMode($enabled") }
+        if (DEBUG) { logDebug("reportFullscreenMode($enabled)") }
         return false // This value is ignored according to the API docs.
     }
 
     override fun getCursorCapsMode(reqModes: Int): Int {
-        if (DEBUG) { logDebug("getCursorCapsMode($reqModes") }
+        if (DEBUG) { logDebug("getCursorCapsMode($reqModes)") }
         return TextUtils.getCapsMode(mTextFieldValue.text, mTextFieldValue.selection.min, reqModes)
     }