diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-08-23 01:29:11 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-08-23 01:29:11 -0700 |
| commit | 2b27f3e6988a5d2a4d4a713a60a0fac9bc68e7c6 (patch) | |
| tree | 50040dfca89b15f341a3d2d6254c134c6b37fd52 /java/src | |
| parent | 0940093c301fab94107976c4db5c0fef868a2ae2 (diff) | |
| parent | f9da4c548f7baa003d8dcee04b42d3652cf2ebc3 (diff) | |
| download | latinime-2b27f3e6988a5d2a4d4a713a60a0fac9bc68e7c6.tar.gz latinime-2b27f3e6988a5d2a4d4a713a60a0fac9bc68e7c6.tar.xz latinime-2b27f3e6988a5d2a4d4a713a60a0fac9bc68e7c6.zip | |
Merge "Remove password field special handling"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/Key.java | 6 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/PopupCharactersParser.java | 7 |
2 files changed, 1 insertions, 12 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java index 397b7b16b..f56b52388 100644 --- a/java/src/com/android/inputmethod/keyboard/Key.java +++ b/java/src/com/android/inputmethod/keyboard/Key.java @@ -295,12 +295,8 @@ public class Key { mY = y; mWidth = keyWidth - mHorizontalGap; - CharSequence[] popupCharacters = style.getTextArray( + final CharSequence[] popupCharacters = style.getTextArray( keyAttr, R.styleable.Keyboard_Key_popupCharacters); - if (params.mId.mPasswordInput) { - popupCharacters = PopupCharactersParser.filterOut( - res, popupCharacters, PopupCharactersParser.NON_ASCII_FILTER); - } // In Arabic symbol layouts, we'd like to keep digits in popup characters regardless of // config_digit_popup_characters_enabled. if (params.mId.isAlphabetKeyboard() && !res.getBoolean( diff --git a/java/src/com/android/inputmethod/keyboard/internal/PopupCharactersParser.java b/java/src/com/android/inputmethod/keyboard/internal/PopupCharactersParser.java index 032489e66..7c5abe32a 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/PopupCharactersParser.java +++ b/java/src/com/android/inputmethod/keyboard/internal/PopupCharactersParser.java @@ -196,13 +196,6 @@ public class PopupCharactersParser { } }; - public static final CodeFilter NON_ASCII_FILTER = new CodeFilter() { - @Override - public boolean shouldFilterOut(int code) { - return code < 0x20 || code > 0x7e; - } - }; - public static CharSequence[] filterOut(Resources res, CharSequence[] popupCharacters, CodeFilter filter) { if (popupCharacters == null || popupCharacters.length < 1) { |