[MediaWiki-commits] [Gerrit] If search is visible, hide it rather than go 'back' - change (apps...wikipedia)

2014-03-16 Thread Yuvipanda (Code Review) 
Yuvipanda has uploaded a new change for review.

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

Change subject: If search is visible, hide it rather than go 'back'
..

If search is visible, hide it rather than go 'back'

Change-Id: I664c3490b72d9a484dd06585dbe037987f018a5c
---
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index de42ab6..feb5155 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -134,8 +134,8 @@
 drawerLayout.closeDrawer(Gravity.START);
 return;
 }
-if ((curPageFragment != null && !curPageFragment.handleBackPressed())
-&& !searchAriclesFragment.handleBackPressed()) {
+if (!searchAriclesFragment.handleBackPressed() &&
+(curPageFragment != null && 
!curPageFragment.handleBackPressed())) {
 if (getSupportFragmentManager().getBackStackEntryCount() <= 1) {
 // Everything we could pop has been popped
 finish();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I664c3490b72d9a484dd06585dbe037987f018a5c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] If search is visible, hide it rather than go 'back' - change (apps...wikipedia)

2014-03-17 Thread Brion VIBBER (Code Review) 
Brion VIBBER has submitted this change and it was merged.

Change subject: If search is visible, hide it rather than go 'back'
..


If search is visible, hide it rather than go 'back'

Change-Id: I664c3490b72d9a484dd06585dbe037987f018a5c
---
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Brion VIBBER: Verified; Looks good to me, approved



diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index de42ab6..feb5155 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -134,8 +134,8 @@
 drawerLayout.closeDrawer(Gravity.START);
 return;
 }
-if ((curPageFragment != null && !curPageFragment.handleBackPressed())
-&& !searchAriclesFragment.handleBackPressed()) {
+if (!searchAriclesFragment.handleBackPressed() &&
+(curPageFragment != null && 
!curPageFragment.handleBackPressed())) {
 if (getSupportFragmentManager().getBackStackEntryCount() <= 1) {
 // Everything we could pop has been popped
 finish();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I664c3490b72d9a484dd06585dbe037987f018a5c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Brion VIBBER 

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