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 860158 - Unset URL input type when entering search string for all IMEs. r=cpeterson

Browse Source
This commit is contained in:
Jim Chen 2013-04-24 15:38:44 -04:00
parent de57c96f87
commit e7c53bdd8c
1 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,6 @@ public class AwesomeBar extends GeckoActivity
private CustomEditText mText;
private ImageButton mGoButton;
private ContextMenuSubject mContextMenuSubject;
private boolean mIsUsingGestureKeyboard;
private boolean mDelayRestartInput;
// The previous autocomplete result returned to us
private String mAutoCompleteResult = "";
@ -275,26 +274,6 @@ public class AwesomeBar extends GeckoActivity
return true;
}
@Override
public void onWindowFocusChanged(boolean hasFocus) {
super.onWindowFocusChanged(hasFocus);
// The Awesome Bar will receive focus when the Awesome Screen first opens or after the user
// closes the "Select Input Method" window. If the input method changes to or from Swype,
// then toggle the URL mode flag. Swype's URL mode disables the automatic word spacing that
// Swype users expect when entering search queries, but does not add any special VKB keys
// like ".com" or "/" that would be useful for entering URLs.
if (!hasFocus)
return;
boolean wasUsingGestureKeyboard = mIsUsingGestureKeyboard;
mIsUsingGestureKeyboard = InputMethods.isGestureKeyboard(this);
if (mIsUsingGestureKeyboard != wasUsingGestureKeyboard) {
updateKeyboardInputType();
}
}
@Override
public void onConfigurationChanged(Configuration newConfiguration) {
super.onConfigurationChanged(newConfiguration);
@ -355,12 +334,13 @@ public class AwesomeBar extends GeckoActivity
}
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.
// If the user enters a space, then we know they are entering search terms, not a URL.
// We can then switch to text mode so,
// 1) the IME auto-inserts spaces between words
// 2) the IME doesn't reset input keyboard to Latin keyboard.
String text = mText.getText().toString();
int currentInputType = mText.getInputType();
int newInputType = mIsUsingGestureKeyboard && StringUtils.isSearchQuery(text, false)
int newInputType = StringUtils.isSearchQuery(text, false)
? (currentInputType & ~InputType.TYPE_TEXT_VARIATION_URI) // Text mode
: (currentInputType | InputType.TYPE_TEXT_VARIATION_URI); // URL mode
if (newInputType != currentInputType) {