diff options
author | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-11-02 17:47:36 +0000 |
---|---|---|
committer | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-11-02 17:47:36 +0000 |
commit | a1f7b64e2b9ebd1bc62c70faa78c35b7e9a63d23 (patch) | |
tree | c1b26dba3f611010633b0c19633cc7154f762eff /navit/android/src | |
parent | ce5532905dd198382917e25b5bd23b5dc2dcbd3c (diff) | |
download | navit-a1f7b64e2b9ebd1bc62c70faa78c35b7e9a63d23.tar.gz |
Add:port_android:Use hardware button to enter the search dialog. Fixes #998.|Thank you, kamikaaze
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5711 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/android/src')
-rw-r--r-- | navit/android/src/org/navitproject/navit/Navit.java | 9 | ||||
-rw-r--r-- | navit/android/src/org/navitproject/navit/NavitGraphics.java | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java index 9f60b5799..3e5d58d72 100644 --- a/navit/android/src/org/navitproject/navit/Navit.java +++ b/navit/android/src/org/navitproject/navit/Navit.java @@ -613,6 +613,15 @@ public class Navit extends Activity {
return dialogs.createDialog(id);
}
+
+ @Override
+ public boolean onSearchRequested() {
+ /* Launch the internal Search Activity */
+ Intent search_intent = new Intent(this, NavitAddressSearchActivity.class);
+ this.startActivityForResult(search_intent, NavitAddressSearch_id);
+
+ return true;
+ }
@Override
public void onDestroy()
diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java index bdef4b4b7..63c20228a 100644 --- a/navit/android/src/org/navitproject/navit/NavitGraphics.java +++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java @@ -439,6 +439,10 @@ public class NavitGraphics } else if (keyCode == android.view.KeyEvent.KEYCODE_SEARCH) { + /* Handle event in Main Activity if map is shown */ + if(in_map) + return false; + s = java.lang.String.valueOf((char) 19); } else if (keyCode == android.view.KeyEvent.KEYCODE_BACK) @@ -561,6 +565,11 @@ public class NavitGraphics return handled; } } + else if (keyCode == android.view.KeyEvent.KEYCODE_SEARCH) { + /* Handle event in Main Activity if map is shown */ + if(in_map) + return false; + } else if (keyCode == android.view.KeyEvent.KEYCODE_BACK) { if (Navit.show_soft_keyboard_now_showing) |