DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Initialize the InputConnection with the text plugin's most recent state (either incoming or outgoing) (flutter/engine#3283)

Browse Source 
Fixes https://github.com/flutter/flutter/issues/7033
This commit is contained in:
Jason Simmons 2016-11-30 15:07:37 -08:00 committed by GitHub
parent 26bbb6d121
commit 7afd100894
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/src/flutter/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java
View File

@ -24,12 +24,14 @@ class InputConnectionAdaptor extends BaseInputConnection {
private FlutterView mView;
private int mClient;
private TextInputPlugin mPlugin;
private JSONObject mOutgoingState;
public InputConnectionAdaptor(FlutterView view, int client) {
public InputConnectionAdaptor(FlutterView view, int client, TextInputPlugin plugin) {
super(view, true);
mView = view;
mClient = client;
mPlugin = plugin;
mOutgoingState = new JSONObject();
}
@ -49,6 +51,8 @@ class InputConnectionAdaptor extends BaseInputConnection {
message.put("method", "TextInputClient.updateEditingState");
message.put("args", args);
mView.sendPlatformMessage(MESSAGE_NAME, message.toString(), null);
mPlugin.setLatestEditingState(mOutgoingState);
} catch (JSONException e) {
Log.e(TAG, "Unexpected error serializing editing state", e);
}

28
engine/src/flutter/shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java
View File

@ -30,7 +30,7 @@ public class TextInputPlugin extends JSONMessageListener {
private final Activity mActivity;
private int mClient = 0;
private JSONObject mConfiguration;
private JSONObject mIncomingState;
private JSONObject mLatestState;
public TextInputPlugin(Activity activity) {
mActivity = activity;
@ -74,15 +74,15 @@ public class TextInputPlugin extends JSONMessageListener {
outAttrs.inputType = inputTypeFromTextInputType(mConfiguration.getString("inputType"));
outAttrs.actionLabel = getStringOrNull(mConfiguration, "actionLabel");
outAttrs.imeOptions = EditorInfo.IME_ACTION_DONE | EditorInfo.IME_FLAG_NO_FULLSCREEN;
InputConnectionAdaptor connection = new InputConnectionAdaptor(view, mClient);
if (mIncomingState != null) {
outAttrs.initialSelStart = mIncomingState.getInt("selectionBase");
outAttrs.initialSelEnd = mIncomingState.getInt("selectionExtent");
connection.getEditable().append(mIncomingState.getString("text"));
connection.setSelection(mIncomingState.getInt("selectionBase"),
mIncomingState.getInt("selectionExtent"));
connection.setComposingRegion(mIncomingState.getInt("composingBase"),
mIncomingState.getInt("composingExtent"));
InputConnectionAdaptor connection = new InputConnectionAdaptor(view, mClient, this);
if (mLatestState != null) {
outAttrs.initialSelStart = mLatestState.getInt("selectionBase");
outAttrs.initialSelEnd = mLatestState.getInt("selectionExtent");
connection.getEditable().append(mLatestState.getString("text"));
connection.setSelection(mLatestState.getInt("selectionBase"),
mLatestState.getInt("selectionExtent"));
connection.setComposingRegion(mLatestState.getInt("composingBase"),
mLatestState.getInt("composingExtent"));
} else {
outAttrs.initialSelStart = 0;
outAttrs.initialSelEnd = 0;
@ -107,7 +107,7 @@ public class TextInputPlugin extends JSONMessageListener {
}
private void setTextInputClient(FlutterView view, int client, JSONObject configuration) throws JSONException {
mIncomingState = null;
mLatestState = null;
mClient = client;
mConfiguration = configuration;
InputMethodManager imm =
@ -116,12 +116,16 @@ public class TextInputPlugin extends JSONMessageListener {
}
private void setTextInputEditingState(FlutterView view, JSONObject state) throws JSONException {
mIncomingState = state;
mLatestState = state;
InputMethodManager imm =
(InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
imm.restartInput(view);
}
void setLatestEditingState(JSONObject state) {
mLatestState = state;
}
private void clearTextInputClient() {
mClient = 0;
}