Skip to content

Commit f457755

Browse files
authored
Revert "Fix the newline on some keyboards (flutter#16560)"
This reverts commit 98b9ff8.
1 parent ce5dc77 commit f457755

File tree

5 files changed

+2
-75
lines changed

5 files changed

+2
-75
lines changed

shell/platform/android/BUILD.gn

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,12 +435,10 @@ action("robolectric_tests") {
435435
"test/io/flutter/embedding/engine/systemchannels/PlatformChannelTest.java",
436436
"test/io/flutter/external/FlutterLaunchTests.java",
437437
"test/io/flutter/plugin/common/StandardMessageCodecTest.java",
438-
"test/io/flutter/plugin/editing/InputConnectionAdaptorTest.java",
439438
"test/io/flutter/plugin/editing/TextInputPluginTest.java",
440439
"test/io/flutter/plugin/platform/PlatformPluginTest.java",
441440
"test/io/flutter/plugin/platform/SingleViewPresentationTest.java",
442441
"test/io/flutter/plugins/GeneratedPluginRegistrant.java",
443-
"test/io/flutter/util/FakeKeyEvent.java",
444442
"test/io/flutter/util/PreconditionsTest.java",
445443
]
446444

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import android.provider.Settings;
1111
import android.text.DynamicLayout;
1212
import android.text.Editable;
13-
import android.text.InputType;
1413
import android.text.Layout;
1514
import android.text.Selection;
1615
import android.text.TextPaint;
@@ -275,11 +274,8 @@ public boolean sendKeyEvent(KeyEvent event) {
275274
int newSel = Math.min(selStart + 1, mEditable.length());
276275
setSelection(newSel, newSel);
277276
return true;
278-
// When the enter key is pressed on a non-multiline field, consider it a
279-
// submit instead of a newline.
280-
} else if ((event.getKeyCode() == KeyEvent.KEYCODE_ENTER
281-
|| event.getKeyCode() == KeyEvent.KEYCODE_NUMPAD_ENTER)
282-
&& (InputType.TYPE_TEXT_FLAG_MULTI_LINE & mEditorInfo.inputType) == 0) {
277+
} else if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER
278+
|| event.getKeyCode() == KeyEvent.KEYCODE_NUMPAD_ENTER) {
283279
performEditorAction(mEditorInfo.imeOptions & EditorInfo.IME_MASK_ACTION);
284280
return true;
285281
} else {

shell/platform/android/test/io/flutter/FlutterTestSuite.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import io.flutter.embedding.engine.systemchannels.PlatformChannelTest;
1818
import io.flutter.external.FlutterLaunchTests;
1919
import io.flutter.plugin.common.StandardMessageCodecTest;
20-
import io.flutter.plugin.editing.InputConnectionAdaptorTest;
2120
import io.flutter.plugin.editing.TextInputPluginTest;
2221
import io.flutter.plugin.platform.PlatformPluginTest;
2322
import io.flutter.plugin.platform.SingleViewPresentationTest;
@@ -45,7 +44,6 @@
4544
FlutterShellArgsTest.class,
4645
FlutterRendererTest.class,
4746
FlutterViewTest.class,
48-
InputConnectionAdaptorTest.class,
4947
PlatformChannelTest.class,
5048
PlatformPluginTest.class,
5149
PluginComponentTest.class,

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

Lines changed: 0 additions & 50 deletions
This file was deleted.

shell/platform/android/test/io/flutter/util/FakeKeyEvent.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)