From c95be4fbb3ec437517a2190d88fbda5068dba8df Mon Sep 17 00:00:00 2001 From: Fabrice Di Meglio Date: Fri, 7 Mar 2014 12:57:38 -0800 Subject: [PATCH] Close the Drawer on BACK button if the Drawer is opened - otherwise (if Drawer is closed), BACK should work as BACK into the Fragments BackStack Change-Id: Ic7f500eb77f35e2142a40e6c9e34c4e7f0ec6428 --- src/com/android/settings/SettingsActivity.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 00e65f243b2..28ff8836db3 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -702,6 +702,15 @@ public class SettingsActivity extends Activity return mFirstHeader; } + @Override + public void onBackPressed() { + if (mDrawerLayout.isDrawerOpen(mDrawer)) { + mDrawerLayout.closeDrawer(mDrawer); + return; + } + super.onBackPressed(); + } + @Override public void onBackStackChanged() { setTitleFromBackStack();