Clear search when SearchView is closed abnormally

Author: guanglinn

app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java

@@ -328,7 +328,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         menu.findItem(R.id.action_share_image).setVisible(true);
         menu.findItem(R.id.action_load_epub).setVisible(isExperimentalFeaturesEnabled);
 
-        // SearchView (View Mode)
+        // Setup SearchView for view-mode
         setupSearchView((SearchView) menu.findItem(R.id.action_search_view).getActionView());
 
         // Set various initial states
@@ -683,7 +683,7 @@ private void setupSearchView(SearchView searchView) {
         if (searchView == null) {
             return;
         }
-        // Only setup SearchView for view-mode, to avoid additional setup for edit-mode
+        // Only setup SearchView for view-mode, to avoid unnecessary setup for edit-mode
         if (!_isPreviewVisible || _webView == null) {
             return;
         }
@@ -720,6 +720,17 @@ public boolean onQueryTextChange(String text) {
                 return search(text);
             }
         });
+        searchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
+            @Override
+            public void onViewAttachedToWindow(@NonNull View v) {
+            }
+
+            @Override
+            public void onViewDetachedFromWindow(@NonNull View v) {
+                searchView.setQuery("", false); // This will make onQueryTextChange be called back
+                searchView.setIconified(true);
+            }
+        });
 
         // Because SearchView doesn't provide a public API to add custom buttons
         // We must get the searchPlate (the layout containing the text field and close button) from SearchView