[MediaWiki-commits] [Gerrit] Whoops: fix toolbar coordinator logic. - change (apps...wikipedia)

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295597

Change subject: Whoops: fix toolbar coordinator logic.
......................................................................

Whoops: fix toolbar coordinator logic.

- Show/hide the correct component in the coordinator.
- Make sure to clear out the OptionsMenu when in search mode.

Change-Id: I7070b73d20fb6bd4ec5140086176b2a41cd60c9c
---
M app/src/main/java/org/wikipedia/MainActivityToolbarCoordinator.java
M app/src/main/java/org/wikipedia/page/PageFragment.java
2 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/97/295597/1

diff --git 
a/app/src/main/java/org/wikipedia/MainActivityToolbarCoordinator.java 
b/app/src/main/java/org/wikipedia/MainActivityToolbarCoordinator.java
index c2bc5f6..78e6303 100644
--- a/app/src/main/java/org/wikipedia/MainActivityToolbarCoordinator.java
+++ b/app/src/main/java/org/wikipedia/MainActivityToolbarCoordinator.java
@@ -35,7 +35,7 @@
 
     public void setSearchMode(boolean enabled) {
         if (overrideToolbar != null) {
-            defaultToolbar.setVisibility(enabled ? View.VISIBLE : View.GONE);
+            toolbarContainerView.setVisibility(enabled ? View.VISIBLE : 
View.GONE);
         }
     }
 
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java 
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index dba9f33..7457550 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -623,11 +623,13 @@
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (!isAdded() || getMainActivity().isSearching()) {
+        if (!isAdded()) {
             return;
         }
         menu.clear();
-        inflater.inflate(R.menu.menu_page_actions, menu);
+        if (!getMainActivity().isSearching()) {
+            inflater.inflate(R.menu.menu_page_actions, menu);
+        }
     }
 
     @Override

-- 
To view, visit https://gerrit.wikimedia.org/r/295597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7070b73d20fb6bd4ec5140086176b2a41cd60c9c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits