Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don't get executed when pressed. Bug: 1909300" into eclair

1 files changed, 4 insertions, 2 deletions

diff --git a/tools/droiddoc/templates/assets/search_autocomplete.js b/tools/droiddoc/templates/assets/search_autocomplete.js
index 086674a0fa..4fa47a5904 100644
--- a/tools/droiddoc/templates/assets/search_autocomplete.js
+++ b/tools/droiddoc/templates/assets/search_autocomplete.js
@@ -107,11 +107,13 @@ function search_changed(e, kd, toroot)
     var text = search.value;
 
     // 13 = enter
-    if (!kd && (e.keyCode == 13)) {
+    if (e.keyCode == 13) {
         document.getElementById("search_filtered_div").className = "no-display";
-        if (gSelectedIndex >= 0) {
+        if (kd && gSelectedIndex >= 0) {
             window.location = toroot + gMatches[gSelectedIndex].link;
             return false;
+        } else if (gSelectedIndex < 0) {
+            return true;
         }
     }
     // 38 -- arrow up