Revert "Revert "Megadrawer" until b/16637856 is fixed."

Want this to be ready when the bug is fixed.

This reverts commit c53c887101aa90b5024af635823023aa801e075f.

Change-Id: Ice73a0f48cbe1e949fde3db3719ee86995778ebb

1 files changed, 3 insertions, 8 deletions

diff --git a/src/com/android/mail/ui/MailActivity.java b/src/com/android/mail/ui/MailActivity.java
index f4c08473a..42b6f7a8e 100644
--- a/src/com/android/mail/ui/MailActivity.java
+++ b/src/com/android/mail/ui/MailActivity.java
@@ -170,15 +170,15 @@ public class MailActivity extends AbstractMailActivity implements ControllableAc
 
         setContentView(mController.getContentViewResource());
 
-        /*
-        Blocked: b/16491458
         if (Utils.isRunningLOrLater()) {
             final Toolbar toolbar = (Toolbar) findViewById(R.id.action_bar);
+            // Toolbar is currently only used on phone layout, so this is expected to be null
+            // on tablets
             if (toolbar != null) {
                 setActionBar(toolbar);
+                toolbar.setNavigationOnClickListener(mController.getNavigationViewClickListener());
             }
         }
-        */
 
         final ActionBar actionBar = getActionBar();
         if (actionBar != null) {
@@ -415,11 +415,6 @@ public class MailActivity extends AbstractMailActivity implements ControllableAc
     }
 
     @Override
-    public UpOrBackController getUpOrBackController() {
-        return mController;
-    }
-
-    @Override
     public DrawerController getDrawerController() {
         return mController.getDrawerController();
     }