1 files changed, 5 insertions, 9 deletions
diff --git a/tests/src/com/android/inputmethod/latin/SuggestHelper.java b/tests/src/com/android/inputmethod/latin/SuggestHelper.java
index cccd1a4a9..2e362458b 100644
--- a/tests/src/com/android/inputmethod/latin/SuggestHelper.java
+++ b/tests/src/com/android/inputmethod/latin/SuggestHelper.java
@@ -21,7 +21,7 @@ import android.text.TextUtils;
 
 import com.android.inputmethod.keyboard.KeyDetector;
 import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.KeyboardId;
+import com.android.inputmethod.keyboard.KeyboardSet;
 
 import java.io.File;
 import java.util.Locale;
@@ -32,24 +32,20 @@ public class SuggestHelper {
     protected final Keyboard mKeyboard;
     private final KeyDetector mKeyDetector;
 
-    public static final int ALPHABET_KEYBOARD = com.android.inputmethod.latin.R.xml.kbd_qwerty;
-
-    public SuggestHelper(Context context, int dictionaryId, KeyboardId keyboardId) {
+    public SuggestHelper(Context context, int dictionaryId, KeyboardSet keyboardSet) {
         // Use null as the locale for Suggest so as to force it to use the internal dictionary
         // (and not try to find a dictionary provider for a specified locale)
         mSuggest = new Suggest(context, dictionaryId, null);
-        mKeyboard = new Keyboard.Builder<Keyboard.Params>(context, new Keyboard.Params())
-                .load(ALPHABET_KEYBOARD, keyboardId).build();
+        mKeyboard = keyboardSet.getMainKeyboard();
         mKeyDetector = new KeyDetector(0);
         init();
     }
 
     protected SuggestHelper(final Context context, final File dictionaryPath,
-            final long startOffset, final long length, final KeyboardId keyboardId,
+            final long startOffset, final long length, final KeyboardSet keyboardSet,
             final Locale locale) {
         mSuggest = new Suggest(context, dictionaryPath, startOffset, length, null, locale);
-        mKeyboard = new Keyboard.Builder<Keyboard.Params>(context, new Keyboard.Params())
-                .load(ALPHABET_KEYBOARD, keyboardId).build();
+        mKeyboard = keyboardSet.getMainKeyboard();
         mKeyDetector = new KeyDetector(0);
         init();
     }