Merge "Remove unnecessarily getKeyFromOutputText method from Keyboard" (a685fc17) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+0 −9

Original line number	Diff line number	Diff line
		@@ -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;

+9 −8

Original line number	Diff line number	Diff line
		@@ -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,22 +147,24 @@ 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) {
		for (final Key key : keyboard.getSortedKeys()) {
		if (key.getCode() == code) {
		return key;
		}
		}
		}
		return null;
		}

		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) {
		for (final DynamicGridKeyboard keyboard : keyboards) {
		for (final Key key : keyboard.getSortedKeys()) {
		if (outputText.equals(key.getOutputText())) {
		return key;
		}
		}
		}
		return null;
		}