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

Merge pull request #1583 from jason-simmons/mojo_merge_client_part2

Browse Source 
Update to mojo aff2415d1e1f4c4a16b3bb608d4dc17c4e924667
This commit is contained in:
Jason Simmons 2015-10-13 09:58:59 -07:00
commit ff99b608d4
2 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
engine/src/flutter/sky/tools/roll/patches/mojo/mojo_converters_input_events.patch
View File

@ -1,20 +0,0 @@
diff --git b/mojo/converters/input_events/input_events_type_converters.cc a/mojo/converters/input_events/input_events_type_converters.cc
index a4f6e73..a7d6a97 100644
--- b/mojo/converters/input_events/input_events_type_converters.cc
+++ a/mojo/converters/input_events/input_events_type_converters.cc
@@ -11,7 +11,6 @@
#include <X11/Xlib.h>
#endif
-#include "base/time/time.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/converters/input_events/mojo_extended_key_event_data.h"
#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
@@ -278,7 +277,6 @@ scoped_ptr<ui::Event> TypeConverter<scoped_ptr<ui::Event>, EventPtr>::Convert(
// TODO: last flags isn't right. Need to send changed_flags.
scoped_ptr<ui::MouseEvent> event(new ui::MouseEvent(
MojoMouseEventTypeToUIEvent(input), location, screen_location,
- base::TimeDelta::FromMilliseconds(input->time_stamp),
ui::EventFlags(input->flags), ui::EventFlags(input->flags)));
if (event->IsMouseWheelEvent()) {
// This conversion assumes we're using the mojo meaning of these

30
engine/src/flutter/sky/tools/roll/patches/mojo/services_keyboard.patch
View File

@ -1,30 +0,0 @@
diff --git a/services/keyboard/src/org/chromium/mojo/keyboard/InputConnectionAdaptor.java b/services/keyboard/src/org/chromium/mojo/keyboard/InputConnectionAdaptor.java
index 42bdd57..a3cdc61 100644
--- a/services/keyboard/src/org/chromium/mojo/keyboard/InputConnectionAdaptor.java
+++ b/services/keyboard/src/org/chromium/mojo/keyboard/InputConnectionAdaptor.java
@@ -4,7 +4,10 @@
package org.chromium.mojo.keyboard;
+import java.lang.StringBuilder;
+
import android.view.View;
+import android.view.KeyEvent;
import android.view.inputmethod.BaseInputConnection;
import android.view.inputmethod.CompletionInfo;
import android.view.inputmethod.CorrectionInfo;
@@ -71,4 +74,14 @@ public class InputConnectionAdaptor extends BaseInputConnection {
mClient.setSelection(start, end);
return super.setSelection(start, end);
}
+
+ // Number keys come through as key events instead of commitText!?
+ @Override
+ public boolean sendKeyEvent(KeyEvent event) {
+ if (event.getAction() == KeyEvent.ACTION_UP) {
+ // 1 appears to always be the value for newCursorPosition?
+ mClient.commitText(String.valueOf(event.getNumber()), 1);
+ }
+ return super.sendKeyEvent(event);
+ }
}