nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Filter Spacer before keyboard layout test"

main
Tadashi G. Takaoka 2014-03-07 10:33:36 +00:00 committed by Android (Google) Code Review
parent a103e29d00 8c6b34e51d
commit a0a8d96c49
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/src/com/android/inputmethod/keyboard/layout/expected/ActualKeyboardBuilder.java
View File

@ -24,7 +24,6 @@ import com.android.inputmethod.latin.utils.CollectionUtils;
import com.android.inputmethod.latin.utils.StringUtils; import com.android.inputmethod.latin.utils.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
@ -44,15 +43,27 @@ public final class ActualKeyboardBuilder extends AbstractKeyboardBuilder<Key> {
} }
}; };
private static ArrayList<Key> filterOutSpacerAndSortKeys(final Key[] keys) {
final ArrayList<Key> filteredKeys = CollectionUtils.newArrayList();
for (final Key key : keys) {
if (key.isSpacer()) {
continue;
}
filteredKeys.add(key);
}
Collections.sort(filteredKeys, ROW_COLUMN_COMPARATOR);
return filteredKeys;
}
/** /**
* Create the keyboard that consists of the array of rows of the actual keyboard's keys. * Create the keyboard that consists of the array of rows of the actual keyboard's keys.
* @param keys the array of keys of the actual keyboard. * @param keys the array of keys of the actual keyboard.
* @return the actual keyboard grouped with rows. * @return the actual keyboard grouped with rows.
*/ */
public static Key[][] buildKeyboard(final Key[] keys) { public static Key[][] buildKeyboard(final Key[] keys) {
// Sort keys from top-left to bottom-right order to prepare to create rows. // Filter out spacer and sort keys from top-left to bottom-right order to prepare to
final ArrayList<Key> sortedKeys = CollectionUtils.newArrayList(Arrays.asList(keys)); // create rows.
Collections.sort(sortedKeys, ROW_COLUMN_COMPARATOR); final ArrayList<Key> sortedKeys = filterOutSpacerAndSortKeys(keys);
// Grouping keys into rows. // Grouping keys into rows.
final ArrayList<ArrayList<Key>> rows = CollectionUtils.newArrayList(); final ArrayList<ArrayList<Key>> rows = CollectionUtils.newArrayList();