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 1014233 - Discard autocomplete result if we are not expecting a result. r=wesj

Browse Source
This commit is contained in:
Jim Chen 2014-05-21 14:58:00 -04:00
parent abc711486f
commit da98473f88
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mobile/android/base/toolbar/ToolbarEditText.java
View File

@ -61,6 +61,8 @@ public class ToolbarEditText extends CustomEditText
private boolean mSettingAutoComplete;
// Spans used for marking the autocomplete text
private Object[] mAutoCompleteSpans;
// Do not process autocomplete result
private boolean mDiscardAutoCompleteResult;
public ToolbarEditText(Context context, AttributeSet attrs) {
super(context, attrs);
@ -226,6 +228,12 @@ public class ToolbarEditText extends CustomEditText
*/
@Override
public final void onAutocomplete(final String result) {
// If mDiscardAutoCompleteResult is true, we temporarily disabled
// autocomplete (due to backspacing, etc.) and we should bail early.
if (mDiscardAutoCompleteResult) {
return;
}
if (!isEnabled() || result == null) {
mAutoCompleteResult = "";
return;
@ -437,6 +445,10 @@ public class ToolbarEditText extends CustomEditText
mAutoCompletePrefixLength = textLength;
// If we are not autocompleting, we set mDiscardAutoCompleteResult to true
// to discard any autocomplete results that are in-flight, and vice versa.
mDiscardAutoCompleteResult = !doAutocomplete;
if (doAutocomplete && mAutoCompleteResult.startsWith(text)) {
// If this text already matches our autocomplete text, autocomplete likely
// won't change. Just reuse the old autocomplete value.