Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

NO_SUGGESTIONS keyboard flag in Android #13099

Merged
justinmc merged 4 commits into from
Oct 23, 2019
Merged

NO_SUGGESTIONS keyboard flag in Android #13099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba3d4ff
Allow control over NO_SUGGESTIONS keyboard flag in Android
justinmc Oct 10, 2019
31d2302
Update tests to include noSuggestions param
justinmc Oct 14, 2019
9cf6705
Change noSuggestions to enableSuggestions
justinmc Oct 21, 2019
99d2723
Merge branch 'master' into no-suggestions
justinmc Oct 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ public static Configuration fromJson(@NonNull JSONObject json) throws JSONExcept
return new Configuration(
json.optBoolean("obscureText"),
json.optBoolean("autocorrect", true),
json.optBoolean("enableSuggestions"),
TextCapitalization.fromValue(json.getString("textCapitalization")),
InputType.fromJson(json.getJSONObject("inputType")),
inputAction,
Expand Down Expand Up @@ -307,6 +308,7 @@ private static Integer inputActionFromTextInputAction(@NonNull String inputActio

public final boolean obscureText;
public final boolean autocorrect;
public final boolean enableSuggestions;
@NonNull
public final TextCapitalization textCapitalization;
@NonNull
Expand All @@ -319,13 +321,15 @@ private static Integer inputActionFromTextInputAction(@NonNull String inputActio
public Configuration(
boolean obscureText,
boolean autocorrect,
boolean enableSuggestions,
@NonNull TextCapitalization textCapitalization,
@NonNull InputType inputType,
@Nullable Integer inputAction,
@Nullable String actionLabel
) {
this.obscureText = obscureText;
this.autocorrect = autocorrect;
this.enableSuggestions = enableSuggestions;
this.textCapitalization = textCapitalization;
this.inputType = inputType;
this.inputAction = inputAction;
Expand Down
3 changes: 3 additions & 0 deletions shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ private static int inputTypeFromTextInputType(
TextInputChannel.InputType type,
boolean obscureText,
boolean autocorrect,
boolean enableSuggestions,
TextInputChannel.TextCapitalization textCapitalization
) {
if (type.type == TextInputChannel.TextInputType.DATETIME) {
Expand Down Expand Up @@ -172,6 +173,7 @@ private static int inputTypeFromTextInputType(
textType |= InputType.TYPE_TEXT_VARIATION_PASSWORD;
} else {
if (autocorrect) textType |= InputType.TYPE_TEXT_FLAG_AUTO_CORRECT;
if (!enableSuggestions) textType |= InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
}

if (textCapitalization == TextInputChannel.TextCapitalization.CHARACTERS) {
Expand Down Expand Up @@ -203,6 +205,7 @@ public InputConnection createInputConnection(View view, EditorInfo outAttrs) {
configuration.inputType,
configuration.obscureText,
configuration.autocorrect,
configuration.enableSuggestions,
configuration.textCapitalization
);
outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_FULLSCREEN;
Expand Down
8 changes: 4 additions & 4 deletions shell/platform/android/test/io/flutter/plugin/editing/TextInputPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void setTextInputEditingState_doesNotRestartWhenTextIsIdentical() {
testImm.setCurrentInputMethodSubtype(inputMethodSubtype);
View testView = new View(RuntimeEnvironment.application);
TextInputPlugin textInputPlugin = new TextInputPlugin(testView, mock(DartExecutor.class), mock(PlatformViewsController.class));
textInputPlugin.setTextInputClient(0, new TextInputChannel.Configuration(false, false, TextInputChannel.TextCapitalization.NONE, null, null, null));
textInputPlugin.setTextInputClient(0, new TextInputChannel.Configuration(false, false, true, TextInputChannel.TextCapitalization.NONE, null, null, null));
// There's a pending restart since we initialized the text input client. Flush that now.
textInputPlugin.setTextInputEditingState(testView, new TextInputChannel.TextEditState("", 0, 0));

Expand All @@ -61,7 +61,7 @@ public void setTextInputEditingState_alwaysRestartsOnAffectedDevices2() {
testImm.setCurrentInputMethodSubtype(inputMethodSubtype);
View testView = new View(RuntimeEnvironment.application);
TextInputPlugin textInputPlugin = new TextInputPlugin(testView, mock(DartExecutor.class), mock(PlatformViewsController.class));
textInputPlugin.setTextInputClient(0, new TextInputChannel.Configuration(false, false, TextInputChannel.TextCapitalization.NONE, null, null, null));
textInputPlugin.setTextInputClient(0, new TextInputChannel.Configuration(false, false, true, TextInputChannel.TextCapitalization.NONE, null, null, null));
// There's a pending restart since we initialized the text input client. Flush that now.
textInputPlugin.setTextInputEditingState(testView, new TextInputChannel.TextEditState("", 0, 0));

Expand All @@ -83,7 +83,7 @@ public void setTextInputEditingState_doesNotRestartOnUnaffectedDevices() {
testImm.setCurrentInputMethodSubtype(inputMethodSubtype);
View testView = new View(RuntimeEnvironment.application);
TextInputPlugin textInputPlugin = new TextInputPlugin(testView, mock(DartExecutor.class), mock(PlatformViewsController.class));
textInputPlugin.setTextInputClient(0, new TextInputChannel.Configuration(false, false, TextInputChannel.TextCapitalization.NONE, null, null, null));
textInputPlugin.setTextInputClient(0, new TextInputChannel.Configuration(false, false, true, TextInputChannel.TextCapitalization.NONE, null, null, null));
// There's a pending restart since we initialized the text input client. Flush that now.
textInputPlugin.setTextInputEditingState(testView, new TextInputChannel.TextEditState("", 0, 0));

Expand All @@ -102,7 +102,7 @@ public void setTextInputEditingState_nullInputMethodSubtype() {

View testView = new View(RuntimeEnvironment.application);
TextInputPlugin textInputPlugin = new TextInputPlugin(testView, mock(DartExecutor.class), mock(PlatformViewsController.class));
textInputPlugin.setTextInputClient(0, new TextInputChannel.Configuration(false, false, TextInputChannel.TextCapitalization.NONE, null, null, null));
textInputPlugin.setTextInputClient(0, new TextInputChannel.Configuration(false, false, true, TextInputChannel.TextCapitalization.NONE, null, null, null));
// There's a pending restart since we initialized the text input client. Flush that now.
textInputPlugin.setTextInputEditingState(testView, new TextInputChannel.TextEditState("", 0, 0));
assertEquals(1, testImm.getRestartCount(testView));
Expand Down