From e913580832b1cf41bbe9e869905cf0b73a3721d8 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Thu, 6 Aug 2015 16:18:16 -0700 Subject: [PATCH] Fix the build after the mojo roll @abarth --- packages/flutter/lib/editing/input.dart | 2 +- packages/flutter/lib/mojo/keyboard.dart | 9 +++++---- packages/flutter/pubspec.yaml | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/flutter/lib/editing/input.dart b/packages/flutter/lib/editing/input.dart index b63251ec455..9e1b44a5a09 100644 --- a/packages/flutter/lib/editing/input.dart +++ b/packages/flutter/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(); } diff --git a/packages/flutter/lib/mojo/keyboard.dart b/packages/flutter/lib/mojo/keyboard.dart index 8b5f4ccf5fb..ea0f8f4c4ad 100644 --- a/packages/flutter/lib/mojo/keyboard.dart +++ b/packages/flutter/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; } diff --git a/packages/flutter/pubspec.yaml b/packages/flutter/pubspec.yaml index 5aa70777688..9078e5a9ece 100644 --- a/packages/flutter/pubspec.yaml +++ b/packages/flutter/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