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

Merge "Fix password variation check code"

Browse source
This commit is contained in:
Ken Wakasa 2011-02-16 22:00:01 -08:00 committed by Android (Google) Code Review
commit eebbe54113
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -494,10 +494,24 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
return container; return container;
} }
private static boolean isPasswordVariation(int variation) { // Please refer to TextView.isPasswordInputType
return variation == InputType.TYPE_TEXT_VARIATION_PASSWORD private static boolean isPasswordInputType(int inputType) {
|| variation == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD final int variation =
|| variation == InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD; inputType & (InputType.TYPE_MASK_CLASS | InputType.TYPE_MASK_VARIATION);
return (variation
== (InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD))
|| (variation
== (InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD))
|| (variation
== (InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD));
}
// Please refer to TextView.isVisiblePasswordInputType
private static boolean isVisiblePasswordInputType(int inputType) {
final int variation =
inputType & (InputType.TYPE_MASK_CLASS | InputType.TYPE_MASK_VARIATION);
return variation
== (InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
} }
private static boolean isEmailVariation(int variation) { private static boolean isEmailVariation(int variation) {
@ -525,8 +539,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// Most such things we decide below in initializeInputAttributesAndGetMode, but we need to // Most such things we decide below in initializeInputAttributesAndGetMode, but we need to
// know now whether this is a password text field, because we need to know now whether we // know now whether this is a password text field, because we need to know now whether we
// want to enable the voice button. // want to enable the voice button.
mVoiceConnector.resetVoiceStates(isPasswordVariation( mVoiceConnector.resetVoiceStates(isPasswordInputType(attribute.inputType)
attribute.inputType & InputType.TYPE_MASK_VARIATION)); || isVisiblePasswordInputType(attribute.inputType));
final int mode = initializeInputAttributesAndGetMode(attribute.inputType); final int mode = initializeInputAttributesAndGetMode(attribute.inputType);
@ -583,7 +597,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
case InputType.TYPE_CLASS_TEXT: case InputType.TYPE_CLASS_TEXT:
mIsSettingsSuggestionStripOn = true; mIsSettingsSuggestionStripOn = true;
// Make sure that passwords are not displayed in candidate view // Make sure that passwords are not displayed in candidate view
if (isPasswordVariation(variation)) { if (isPasswordInputType(inputType) || isVisiblePasswordInputType(inputType)) {
mIsSettingsSuggestionStripOn = false; mIsSettingsSuggestionStripOn = false;
} }
if (isEmailVariation(variation) if (isEmailVariation(variation)