wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 862069 - Toggle gesture keyboards' input type when user enters a search query in the AwesomeBar. r=jchen

Browse Source
This commit is contained in:
Chris Peterson 2013-04-06 00:24:11 -07:00
parent 3c98334d35
commit e432705a1b
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mobile/android/base/AwesomeBar.java
View File

@ -290,14 +290,9 @@ public class AwesomeBar extends GeckoActivity
boolean wasUsingGestureKeyboard = mIsUsingGestureKeyboard;
mIsUsingGestureKeyboard = InputMethods.isGestureKeyboard(this);
if (mIsUsingGestureKeyboard == wasUsingGestureKeyboard)
return;
int currentInputType = mText.getInputType();
int newInputType = mIsUsingGestureKeyboard
? (currentInputType & ~InputType.TYPE_TEXT_VARIATION_URI) // Text mode
: (currentInputType | InputType.TYPE_TEXT_VARIATION_URI); // URL mode
mText.setRawInputType(newInputType);
if (mIsUsingGestureKeyboard != wasUsingGestureKeyboard) {
updateKeyboardInputType();
}
}
@Override
@ -352,12 +347,27 @@ public class AwesomeBar extends GeckoActivity
restartInput = true;
}
if (restartInput) {
updateKeyboardInputType();
imm.restartInput(mText);
mGoButton.setImageResource(imageResource);
mGoButton.setContentDescription(contentDescription);
}
}
private void updateKeyboardInputType() {
// If the user enters a space, then we know they are entering search terms, not a URL. If
// we're using a gesture keyboard, we can then switch to text mode so the IME auto-inserts
// spaces between words.
String text = mText.getText().toString();
int currentInputType = mText.getInputType();
int newInputType = mIsUsingGestureKeyboard && StringUtils.isSearchQuery(text, false)
? (currentInputType & ~InputType.TYPE_TEXT_VARIATION_URI) // Text mode
: (currentInputType | InputType.TYPE_TEXT_VARIATION_URI); // URL mode
if (newInputType != currentInputType) {
mText.setRawInputType(newInputType);
}
}
private void cancelAndFinish() {
setResult(Activity.RESULT_CANCELED);
finish();