Merge remote-tracking branch 'origin/master'

TeamNewPipe · Mar 13, 2016 · 794ae4c · 794ae4c
2 parents 060e744 + de62ed7
commit 794ae4c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
@@ -245,6 +245,9 @@ protected void onCreate(Bundle savedInstanceState) {
                 // the support version on SearchView, so it needs to be set programmatically.
                 searchView.setIconifiedByDefault(false);
                 searchView.setIconified(false);
+                if(!searchQuery.isEmpty()) {
+                    searchView.setQuery(searchQuery,false);
+                }
                 searchView.setOnQueryTextListener(new SearchVideoQueryListener());
                 suggestionListAdapter = new SuggestionListAdapter(this);
                 searchView.setSuggestionsAdapter(suggestionListAdapter);
@@ -321,7 +324,10 @@ public boolean onCreateOptionsMenu(Menu menu) {
             suggestionListAdapter = new SuggestionListAdapter(this);
             searchView.setSuggestionsAdapter(suggestionListAdapter);
             searchView.setOnSuggestionListener(new SearchSuggestionListener(searchView));
-
+            if(!searchQuery.isEmpty()) {
+                searchView.setQuery(searchQuery,false);
+                searchView.setIconifiedByDefault(false);
+            }
         } else if (videoFragment != null){
             videoFragment.onCreateOptionsMenu(menu, inflater);
         } else {