Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b1665f2e: Fix regression in handling the \'Go\' button

Browse Source 
Merge commit 'b1665f2e15439f693b1ef75cb1c07593f99edde7'

* commit 'b1665f2e15439f693b1ef75cb1c07593f99edde7':
  Fix regression in handling the 'Go' button
This commit is contained in:
Satish Sampath
2009-07-12 06:06:21 -07:00
committed by The Android Open Source Project
parent 93153beb3d b1665f2e15
commit 17596e3adc
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/java/android/app/SearchDialog.java
View File

@@ -962,19 +962,18 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
&& event.getAction() == KeyEvent.ACTION_UP) {
v.cancelLongPress();
if (mSearchable.autoUrlDetect()) {
// If this is a url entered by the user & we displayed the 'Go' button which
// the user clicked, launch the url instead of using it as a search query.
if ((mSearchAutoCompleteImeOptions & EditorInfo.IME_MASK_ACTION)
// If this is a url entered by the user & we displayed the 'Go' button which
// the user clicked, launch the url instead of using it as a search query.
if (mSearchable.autoUrlDetect() &&
(mSearchAutoCompleteImeOptions & EditorInfo.IME_MASK_ACTION)
== EditorInfo.IME_ACTION_GO) {
Uri uri = Uri.parse(fixUrl(mSearchAutoComplete.getText().toString()));
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
launchIntent(intent);
} else {
// Launch as a regular search.
launchQuerySearch();
}
Uri uri = Uri.parse(fixUrl(mSearchAutoComplete.getText().toString()));
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
launchIntent(intent);
} else {
// Launch as a regular search.
launchQuerySearch();
}
return true;
}