Merge "Close the Drawer on BACK button if the Drawer is opened"

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();