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

Merge "Remove unnecessarily getKeyFromOutputText method from Keyboard"

main
Tadashi G. Takaoka 2014-04-22 01:57:32 +00:00 committed by Android (Google) Code Review
parent 543d25d786 0ea82be889
commit a685fc1792
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/com/android/inputmethod/keyboard/Keyboard.java
View File

@ -166,15 +166,6 @@ public class Keyboard {
return mSortedKeys;
}
public Key getKeyFromOutputText(final String outputText) {
for (final Key key : getSortedKeys()) {
if (outputText.equals(key.getOutputText())) {
return key;
}
}
return null;
}
public Key getKey(final int code) {
if (code == Constants.CODE_UNSPECIFIED) {
return null;

17
java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java
View File

@ -29,7 +29,6 @@ import com.android.inputmethod.latin.utils.JsonUtils;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@ -148,9 +147,10 @@ public class DynamicGridKeyboard extends Keyboard {
private static Key getKeyByCode(final Collection<DynamicGridKeyboard> keyboards,
final int code) {
for (final DynamicGridKeyboard keyboard : keyboards) {
final Key key = keyboard.getKey(code);
if (key != null) {
return key;
for (final Key key : keyboard.getSortedKeys()) {
if (key.getCode() == code) {
return key;
}
}
}
return null;
@ -158,10 +158,11 @@ public class DynamicGridKeyboard extends Keyboard {
private static Key getKeyByOutputText(final Collection<DynamicGridKeyboard> keyboards,
final String outputText) {
for (final DynamicGridKeyboard kbd : keyboards) {
final Key key = kbd.getKeyFromOutputText(outputText);
if (key != null) {
return key;
for (final DynamicGridKeyboard keyboard : keyboards) {
for (final Key key : keyboard.getSortedKeys()) {
if (outputText.equals(key.getOutputText())) {
return key;
}
}
}
return null;