Brion VIBBER has submitted this change and it was merged.
Change subject: If drawer is open when back is pressed, hide it
......................................................................
If drawer is open when back is pressed, hide it
Change-Id: Ib7d405c0152bfce629f247e60b75231abc1e01e3
---
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
1 file changed, 11 insertions(+), 9 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 f1acb90..de42ab6 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -1,10 +1,14 @@
package org.wikipedia.page;
+import android.app.*;
import android.content.*;
import android.net.*;
import android.os.*;
-import android.support.v4.app.*;
-import android.view.Gravity;
+import android.preference.*;
+import android.support.v4.widget.*;
+import android.support.v7.app.*;
+import android.view.*;
+import android.widget.*;
import com.squareup.otto.*;
import org.wikipedia.*;
import org.wikipedia.events.*;
@@ -12,13 +16,7 @@
import org.wikipedia.interlanguage.*;
import org.wikipedia.recurring.*;
import org.wikipedia.search.*;
-
-import android.app.AlertDialog;
-import android.preference.PreferenceManager;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarActivity;
-import android.widget.Toast;
-import org.wikipedia.settings.SettingsActivity;
+import org.wikipedia.settings.*;
public class PageActivity extends ActionBarActivity {
public static final String ACTION_PAGE_FOR_TITLE =
"org.wikipedia.page_for_title";
@@ -132,6 +130,10 @@
}
@Override
public void onBackPressed() {
+ if (drawerLayout.isDrawerOpen(Gravity.START)) {
+ drawerLayout.closeDrawer(Gravity.START);
+ return;
+ }
if ((curPageFragment != null && !curPageFragment.handleBackPressed())
&& !searchAriclesFragment.handleBackPressed()) {
if (getSupportFragmentManager().getBackStackEntryCount() <= 1) {
--
To view, visit https://gerrit.wikimedia.org/r/118782
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7d405c0152bfce629f247e60b75231abc1e01e3
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
