Only call when multiline, and update test to send correct inputtype

Author: justinmc

shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java

@@ -8,6 +8,7 @@
 import android.os.Build;
 import android.text.DynamicLayout;
 import android.text.Editable;
+import android.text.InputType;
 import android.text.Layout;
 import android.text.Selection;
 import android.text.TextPaint;
@@ -221,12 +222,15 @@ public boolean sendKeyEvent(KeyEvent event) {
         int newSel = Math.min(selStart + 1, mEditable.length());
         setSelection(newSel, newSel);
         return true;
+      // When the enter key is pressed on a non-multiline field, consider it a
+      // submit instead of a newline.
+      } else if ((event.getKeyCode() == KeyEvent.KEYCODE_ENTER
+        || event.getKeyCode() == KeyEvent.KEYCODE_NUMPAD_ENTER)
+        && mEditorInfo.inputType != (InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_MULTI_LINE)) {
+          performEditorAction(mEditorInfo.imeOptions & EditorInfo.IME_MASK_ACTION);
+          return true;
       } else {
         // Enter a character.
-        if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER
-            || event.getKeyCode() == KeyEvent.KEYCODE_NUMPAD_ENTER) {
-          performEditorAction(mEditorInfo.imeOptions & EditorInfo.IME_MASK_ACTION);
-        }
         int character = event.getUnicodeChar();
         if (character != 0) {
           int selStart = Math.max(0, Selection.getSelectionStart(mEditable));

shell/platform/android/test/io/flutter/plugin/editing/InputConnectionAdaptorTest.java

@@ -17,6 +17,7 @@
 import android.os.Build;
 import android.provider.Settings;
 import android.text.Editable;
+import android.text.InputType;
 import android.util.SparseIntArray;
 import android.view.KeyEvent;
 import android.view.View;
@@ -61,6 +62,7 @@ public void inputConnectionAdaptor_ReceivesEnter() throws NullPointerException {
     Editable mEditable = Editable.Factory.getInstance().newEditable("");
     Editable spyEditable = spy(mEditable);
     EditorInfo outAttrs = new EditorInfo();
+    outAttrs.inputType = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_MULTI_LINE;
 
     InputConnectionAdaptor inputConnectionAdaptor = new InputConnectionAdaptor(
       testView,