Prevent "attach from Drive" menu showing for non-gmail

accounts.

Change-Id: I4f289e60082d372a1662372768890772fe0d7633

1 files changed, 15 insertions, 2 deletions

diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 5779a79d3..af53fb959 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -2300,8 +2300,9 @@ public class ComposeActivity extends ActionBarActivity
                             || Intent.ACTION_SENDTO.equals(action)
                             || shouldSave()));
 
-        MenuItem helpItem = menu.findItem(R.id.help_info_menu_item);
-        MenuItem sendFeedbackItem = menu.findItem(R.id.feedback_menu_item);
+        final MenuItem helpItem = menu.findItem(R.id.help_info_menu_item);
+        final MenuItem sendFeedbackItem = menu.findItem(R.id.feedback_menu_item);
+        final MenuItem attachFromServiceItem = menu.findItem(R.id.attach_from_service_stub1);
         if (helpItem != null) {
             helpItem.setVisible(mAccount != null
                     && mAccount.supportsCapability(AccountCapabilities.HELP_CONTENT));
@@ -2310,6 +2311,9 @@ public class ComposeActivity extends ActionBarActivity
             sendFeedbackItem.setVisible(mAccount != null
                     && mAccount.supportsCapability(AccountCapabilities.SEND_FEEDBACK));
         }
+        if (attachFromServiceItem != null) {
+            attachFromServiceItem.setVisible(shouldEnableAttachFromServiceMenu(mAccount));
+        }
 
         // Show attach picture on pre-K devices.
         menu.findItem(R.id.add_photo_attachment).setVisible(!Utils.isRunningKitkatOrLater());
@@ -2800,6 +2804,13 @@ public class ComposeActivity extends ActionBarActivity
     }
 
     /**
+     * Returns whether the "Attach from Drive" menu item should be visible.
+     */
+    protected boolean shouldEnableAttachFromServiceMenu(Account mAccount) {
+        return false;
+    }
+
+    /**
      * Check if all fields are blank.
      * @return boolean
      */
@@ -3568,6 +3579,8 @@ public class ComposeActivity extends ActionBarActivity
             }
             mReplyFromChanged = true;
             initRecipients();
+
+            invalidateOptionsMenu();
         }
     }