commit a703d8a647a7272347c47bbb394b1a4c403106a5
author Tony Mantler <nicoya@google.com> Wed Jul 31 12:00:46 2013 -0700
committer Tony Mantler <nicoya@google.com> Wed Jul 31 16:07:02 2013 -0700
tree 364c8467ab3c0d885ebf4c1505798e260ff1687e
parent e7a2224619ec4c5ebaa7ef269e5880542a4e6e40

Add more drawer logic to CAB mode enabling

b/10097179

Change-Id: Icc4f2459fac1e1c677fee2d787f51a230bffd198

src/com/android/mail/ui/AbstractActivityController.java

diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index bcf4e26..d55b93a 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -3079,7 +3079,7 @@
      * Re-enable the CAB menu if required. The selection set is not changed.
      */
     protected void enableCabMode() {
-        if (mCabActionMenu != null) {
+        if (mCabActionMenu != null && !mDrawerContainer.isDrawerOpen(mDrawerPullout)) {
             mCabActionMenu.activate();
         }
     }
@@ -3089,7 +3089,9 @@
      */
     protected void maybeEnableCabMode() {
         if (!mSelectedSet.isEmpty()) {
-            enableCabMode();
+            if (mCabActionMenu != null) {
+                mCabActionMenu.activate();
+            }
         }
     }