Provoke search with the Return key in addition to the Done key

Also ensure that starting a search closes the keyboard.

1 files changed, 9 insertions, 2 deletions

diff --git a/android/src/com/artifex/mupdf/MuPDFActivity.java b/android/src/com/artifex/mupdf/MuPDFActivity.java
index 18c0f864..61ac7cdf 100644
--- a/android/src/com/artifex/mupdf/MuPDFActivity.java
+++ b/android/src/com/artifex/mupdf/MuPDFActivity.java
@@ -349,16 +349,22 @@ public class MuPDFActivity extends Activity
 			}
 		});
 
+		mSearchText.setOnKeyListener(new View.OnKeyListener() {
+			public boolean onKey(View v, int keyCode, KeyEvent event) {
+				if (event.getAction() == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER)
+					search(1);
+				return false;
+			}
+		});
+
 		// Activate search invoking buttons
 		mSearchBack.setOnClickListener(new View.OnClickListener() {
 			public void onClick(View v) {
-				hideKeyboard();
 				search(-1);
 			}
 		});
 		mSearchFwd.setOnClickListener(new View.OnClickListener() {
 			public void onClick(View v) {
-				hideKeyboard();
 				search(1);
 			}
 		});
@@ -616,6 +622,7 @@ public class MuPDFActivity extends Activity
 	}
 
 	void search(int direction) {
+		hideKeyboard();
 		if (core == null)
 			return;
 		killSearch();