Merge remote branch 'goog/master' into merge

1 files changed, 1 insertions, 19 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardView.java
index 71ca8b81a..8f20a22d0 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboardView.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboardView.java
@@ -78,17 +78,6 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
         setKeyboardLocal(k);
     }
 
-    private static boolean hasOneDigitAlternate(Key key) {
-        final CharSequence alternates = key.popupCharacters;
-        if (alternates == null)
-            return false;
-        final String altChars = alternates.toString();
-        if (altChars.codePointCount(0, altChars.length()) != 1)
-            return false;
-        final int altCode = altChars.codePointAt(0);
-        return altCode >= '0' && altCode <= '9';
-    }
-
     @Override
     protected boolean onLongPress(Key key) {
         int primaryCode = key.codes[0];
@@ -104,13 +93,6 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
                     LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE,
                     LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE);
             return true;
-        } else if (hasOneDigitAlternate(key)) {
-            mKeyCodes[0] = primaryCode = key.popupCharacters.charAt(0);
-            // when there is only one alternate character, send it as key action.
-            getOnKeyboardActionListener().onKey(primaryCode, mKeyCodes,
-                    LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE,
-                    LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE);
-            return true;
         } else {
             return super.onLongPress(key);
         }
@@ -131,7 +113,7 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
 
     public boolean setShiftLocked(boolean shiftLocked) {
         Keyboard keyboard = getKeyboard();
-        if (keyboard != null && keyboard instanceof LatinKeyboard) {
+        if (keyboard instanceof LatinKeyboard) {
             ((LatinKeyboard)keyboard).setShiftLocked(shiftLocked);
             invalidateAllKeys();
             return true;