commit a685fc1792ae849fa7d5a3f693766fc3203dcba7
author Tadashi G. Takaoka <takaoka@google.com> Tue Apr 22 01:57:32 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 22 01:57:32 2014 +0000
tree 1f2fa32dbe23c7df87d57b207a9fab9a61f35fda
parent 543d25d78686b25ff15996905503975c3b3b580d
parent 0ea82be889df77546956c0fe93664622fa4ccb29

Merge "Remove unnecessarily getKeyFromOutputText method from Keyboard"

java/src/com/android/inputmethod/keyboard/Keyboard.java

diff --git a/java/src/com/android/inputmethod/keyboard/Keyboard.java b/java/src/com/android/inputmethod/keyboard/Keyboard.java
index 801e325..f646a03 100644
--- a/java/src/com/android/inputmethod/keyboard/Keyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/Keyboard.java
@@ -166,15 +166,6 @@
         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;

java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java

diff --git a/java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java b/java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java
index bf76ca4..397c098 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java
@@ -29,7 +29,6 @@
 
 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 @@
     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 @@
 
     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;