Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17596e3a authored by Satish Sampath's avatar Satish Sampath Committed by The Android Open Source Project
Browse files

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

Merge commit 'b1665f2e'

* commit 'b1665f2e':
  Fix regression in handling the 'Go' button
parents 93153beb b1665f2e

core/java/android/app/SearchDialog.java

+11 −12
Original line number Diff line number Diff line
@@ -962,10 +962,10 @@ 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 (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);
@@ -975,7 +975,6 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
                        // Launch as a regular search.

                        launchQuerySearch();

                    }

                    }

                    return true;

                }

                if (event.getAction() == KeyEvent.ACTION_DOWN) {