diff options
Diffstat (limited to 'src/com/android/browser/UrlInputView.java')
| -rw-r--r-- | src/com/android/browser/UrlInputView.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/com/android/browser/UrlInputView.java b/src/com/android/browser/UrlInputView.java index 23e412dd1..6817b368e 100644 --- a/src/com/android/browser/UrlInputView.java +++ b/src/com/android/browser/UrlInputView.java @@ -166,16 +166,14 @@ public class UrlInputView extends AutoCompleteTextView performFiltering(getText().toString(), 0); showDropDown(); } + } else { + finishInput(null, null, null); } if (mWrappedFocusListener != null) { mWrappedFocusListener.onFocusChange(v, hasFocus); } } - void stopEditing() { - finishInput(null, null, null); - } - public void setUrlInputListener(UrlInputListener listener) { mListener = listener; } @@ -221,7 +219,7 @@ public class UrlInputView extends AutoCompleteTextView @Override public void onSearch(String search) { - mListener.onEdit(search); + mListener.onCopySuggestion(search); } @Override @@ -232,9 +230,10 @@ public class UrlInputView extends AutoCompleteTextView @Override public boolean onKeyPreIme(int keyCode, KeyEvent evt) { - if (keyCode == KeyEvent.KEYCODE_BACK) { + if ((evt.getAction() == KeyEvent.ACTION_DOWN) + && (keyCode == KeyEvent.KEYCODE_BACK)) { // catch back key in order to do slightly more cleanup than usual - finishInput(null, null, null); + clearFocus(); return true; } return super.onKeyPreIme(keyCode, evt); @@ -254,7 +253,7 @@ public class UrlInputView extends AutoCompleteTextView public void onAction(String text, String extra, String source); - public void onEdit(String text); + public void onCopySuggestion(String text); } |