Fix the build after the mojo roll

@abarth

sky/packages/sky/lib/editing/input.dart

@@ -59,7 +59,7 @@ class Input extends StatefulComponent {
     bool focused = Focus.at(this);
 
     if (focused && !_keyboardHandle.attached) {
-      _keyboardHandle = keyboard.show(_editableValue.stub);
+      _keyboardHandle = keyboard.show(_editableValue.stub, KeyboardType_TEXT);
     } else if (!focused && _keyboardHandle.attached) {
       _keyboardHandle.release();
     }

sky/packages/sky/lib/mojo/keyboard.dart

@@ -4,6 +4,7 @@
 
 import 'package:mojo_services/keyboard/keyboard.mojom.dart';
 import 'package:sky/mojo/shell.dart' as shell;
+export 'package:mojo_services/keyboard/keyboard.mojom.dart';
 
 class _KeyboardConnection {
 
@@ -29,14 +30,14 @@ class Keyboard {
 
   KeyboardHandle _currentHandle;
 
-  KeyboardHandle show(KeyboardClientStub stub) {
+  KeyboardHandle show(KeyboardClientStub stub, int keyboardType) {
     assert(stub != null);
     if (_currentHandle != null) {
       if (_currentHandle.stub == stub)
         return _currentHandle;
       _currentHandle.release();
     }
-    _currentHandle = new KeyboardHandle._show(this, stub);
+    _currentHandle = new KeyboardHandle._show(this, stub, keyboardType);
     return _currentHandle;
   }
 
@@ -44,8 +45,8 @@ class Keyboard {
 
 class KeyboardHandle {
 
-  KeyboardHandle._show(Keyboard keyboard, this.stub) : _keyboard = keyboard {
-    _keyboard.service.show(stub);
+  KeyboardHandle._show(Keyboard keyboard, this.stub, int keyboardType) : _keyboard = keyboard {
+    _keyboard.service.show(stub, keyboardType);
     _attached = true;
   }
 

sky/packages/sky/pubspec.yaml

@@ -6,8 +6,8 @@ homepage: https://github.com/domokit/sky_engine/tree/master/sky/packages/sky
 dependencies:
   cassowary: ^0.1.7
   material_design_icons: ^0.0.2
-  mojo_services: 0.0.21
-  mojo: 0.0.21
+  mojo_services: 0.0.22
+  mojo: 0.0.22
   newton: ^0.1.2
   sky_engine: ^0.0.6
   sky_services: ^0.0.6

sky/shell/android/org/domokit/sky/shell/PlatformViewAndroid.java

@@ -17,6 +17,7 @@ import android.view.inputmethod.InputConnection;
 import org.chromium.base.JNINamespace;
 import org.chromium.mojo.bindings.InterfaceRequest;
 import org.chromium.mojo.keyboard.KeyboardServiceImpl;
+import org.chromium.mojo.keyboard.KeyboardServiceState;
 import org.chromium.mojo.system.Core;
 import org.chromium.mojo.system.Pair;
 import org.chromium.mojo.system.impl.CoreImpl;
@@ -40,6 +41,7 @@ public class PlatformViewAndroid extends SurfaceView
     private final SurfaceHolder.Callback mSurfaceCallback;
     private GestureProvider mGestureProvider;
     private final EdgeDims mPadding;
+    private final KeyboardServiceState mKeyboardState;
 
     /**
      * Dimensions in each of the four cardinal directions.
@@ -95,7 +97,10 @@ public class PlatformViewAndroid extends SurfaceView
         getHolder().addCallback(mSurfaceCallback);
 
         mGestureProvider = new GestureProvider(context, this);
-        KeyboardServiceImpl.setActiveView(this);
+
+        // TODO(eseidel): We need per-view services!
+        mKeyboardState = new KeyboardServiceState(this);
+        KeyboardServiceImpl.setViewState(mKeyboardState);
     }
 
     SkyEngine getEngine() {
@@ -125,7 +130,7 @@ public class PlatformViewAndroid extends SurfaceView
 
     @Override
     public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
-        return KeyboardServiceImpl.createInputConnection(outAttrs);
+        return mKeyboardState.createInputConnection(outAttrs);
     }
 
     private int getTypeForAction(int maskedAction) {