From 9775ff1a30f349931e0a811da42622bcc40c849c Mon Sep 17 00:00:00 2001 From: Lucas Rocha Date: Wed, 16 Nov 2011 15:03:52 +0000 Subject: [PATCH] Bug 702688 - Search key on awesomebar screen should dismiss it (r=mfinkle) --- embedding/android/AwesomeBar.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/embedding/android/AwesomeBar.java b/embedding/android/AwesomeBar.java index 76e3c9b7420..cde59ea7d4d 100644 --- a/embedding/android/AwesomeBar.java +++ b/embedding/android/AwesomeBar.java @@ -139,6 +139,14 @@ public class AwesomeBar extends Activity { super.onConfigurationChanged(newConfiguration); } + @Override + public boolean onSearchRequested() { + setResult(Activity.RESULT_CANCELED); + finish(); + + return true; + } + private void openUrlAndFinish(String url) { Intent resultIntent = new Intent(); resultIntent.putExtra(URL_KEY, url); @@ -153,6 +161,8 @@ public class AwesomeBar extends Activity { // This method is called only if the key event was not handled // by any of the views, which usually means the edit box lost focus if (keyCode == KeyEvent.KEYCODE_BACK || + keyCode == KeyEvent.KEYCODE_MENU || + keyCode == KeyEvent.KEYCODE_SEARCH || keyCode == KeyEvent.KEYCODE_DPAD_UP || keyCode == KeyEvent.KEYCODE_DPAD_DOWN || keyCode == KeyEvent.KEYCODE_DPAD_LEFT ||