Brion VIBBER has submitted this change and it was merged.
Change subject: Hide search results if drawer is opened
......................................................................
Hide search results if drawer is opened
Bug: 61717
Change-Id: I5bf3efbb64cc64bea771a409035effa731c23242
---
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
1 file changed, 7 insertions(+), 5 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index 2214532..01451db 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -60,6 +60,12 @@
if (results == null) {
searchResultsList.setVisibility(View.GONE);
isSearchActive = false;
+ searchHandler.removeMessages(MESSAGE_SEARCH);
+ if (curSearchTask != null) {
+ curSearchTask.cancel();
+ curSearchTask = null;
+ }
+ searchProgress.setVisibility(View.GONE);
} else if (results.size() == 0) {
searchNoResults.setVisibility(View.VISIBLE);
} else {
@@ -213,6 +219,7 @@
if (drawerLayout.isDrawerVisible(Gravity.START)) {
drawerLayout.closeDrawer(Gravity.START);
} else {
+ displayResults(null);
drawerLayout.openDrawer(Gravity.START);
}
}
@@ -227,11 +234,6 @@
}
if (term.equals("")) {
displayResults(null);
- searchHandler.removeMessages(MESSAGE_SEARCH);
- if (curSearchTask != null) {
- curSearchTask.cancel();
- curSearchTask = null;
- }
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/114767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5bf3efbb64cc64bea771a409035effa731c23242
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
