Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

timob-15877: Fix keyboard regressions #5059

Merged
merged 1 commit into from
Dec 5, 2013
Merged

timob-15877: Fix keyboard regressions #5059

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 12 additions & 9 deletions android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIText.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ public void processProperties(KrollDict d)
|| d.containsKey(TiC.PROPERTY_EDITABLE)) {
handleKeyboard(d);
}


if (d.containsKey(TiC.PROPERTY_AUTO_LINK)) {
TiUIHelper.linkifyIfEnabled(tv, d.get(TiC.PROPERTY_AUTO_LINK));
Expand Down Expand Up @@ -255,11 +256,7 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
KrollDict d = proxy.getProperties();
handleKeyboard(d);
} else if (key.equals(TiC.PROPERTY_RETURN_KEY_TYPE)) {
// Update the keyboard as well when changing the return key type. This is to account for the scenario when
// autocapitalization is enabled during creation and return key type is dynamically changed.
KrollDict d = proxy.getProperties();
handleReturnKeyType(TiConvert.toInt(newValue));
handleKeyboard(d);
} else if (key.equals(TiC.PROPERTY_FONT)) {
TiUIHelper.styleText(tv, (HashMap) newValue);
} else if (key.equals(TiC.PROPERTY_AUTO_LINK)) {
Expand Down Expand Up @@ -500,11 +497,12 @@ protected char[] getAcceptedChars() {
textTypeAndClass |= InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS;
break;
}

if (passwordMask) {
textTypeAndClass |= InputType.TYPE_TEXT_VARIATION_PASSWORD;
// Sometimes password transformation does not work properly when the input type is set after the transformation method.
// This issue has been filed at http://code.google.com/p/android/issues/detail?id=7092
tv.setInputType(tv.getInputType() | textTypeAndClass);
tv.setInputType(textTypeAndClass);
tv.setTransformationMethod(PasswordTransformationMethod.getInstance());

//turn off text UI in landscape mode b/c Android numeric passwords are not masked correctly in landscape mode.
Expand All @@ -513,7 +511,7 @@ protected char[] getAcceptedChars() {
}

} else {
tv.setInputType(tv.getInputType() | textTypeAndClass);
tv.setInputType(textTypeAndClass);
if (tv.getTransformationMethod() instanceof PasswordTransformationMethod) {
tv.setTransformationMethod(null);
}
Expand All @@ -537,9 +535,6 @@ public void setSelection(int start, int end)

public void handleReturnKeyType(int type)
{
if (!field) {
tv.setInputType(InputType.TYPE_TEXT_FLAG_IME_MULTI_LINE);
}
switch(type) {
case RETURNKEY_GO:
tv.setImeOptions(EditorInfo.IME_ACTION_GO);
Expand Down Expand Up @@ -575,5 +570,13 @@ public void handleReturnKeyType(int type)
tv.setImeOptions(EditorInfo.IME_ACTION_SEND);
break;
}

int currentInputType = tv.getInputType();
//FLAG_MULTI_LINE will display enter key, therefore disables our ime options.
if (!field && (currentInputType & InputType.TYPE_TEXT_FLAG_MULTI_LINE) != 0) {
currentInputType &= ~InputType.TYPE_TEXT_FLAG_MULTI_LINE;
}
//Set input type caches ime options, so whenever we change ime options, we must reset input type
tv.setInputType(currentInputType);
}
}