New attach UI: file-only on K, photo & file pre-K.

Change-Id: I5248db59e7b9bfdb8e498b0f4695ba2c427109ae
diff --git a/res/menu-sw600dp/compose_menu.xml b/res/menu-sw600dp/compose_menu.xml
index 00e38bd..df3a111 100644
--- a/res/menu-sw600dp/compose_menu.xml
+++ b/res/menu-sw600dp/compose_menu.xml
@@ -27,21 +27,16 @@
         android:title="@string/save_draft"
         android:alphabeticShortcut="@string/trigger_save_char" />
 
+    <item android:id="@+id/add_photo_attachment"
+          android:icon="@drawable/ic_attachment_holo_light"
+          android:title="@string/add_photo_attachment"
+          android:showAsAction="never" />
+
     <item android:id="@+id/add_file_attachment"
         android:icon="@drawable/ic_attachment_holo_light"
         android:title="@string/add_file_attachment"
         android:showAsAction="never" />
 
-    <item android:id="@+id/add_photo_attachment"
-        android:icon="@drawable/ic_attachment_holo_light"
-        android:title="@string/add_photo_attachment"
-        android:showAsAction="never" />
-
-    <item android:id="@+id/add_video_attachment"
-        android:icon="@drawable/ic_attachment_holo_light"
-        android:title="@string/add_video_attachment"
-        android:showAsAction="never" />
-
     <item android:id="@+id/discard"
         android:showAsAction="never"
         android:title="@string/discard" />
diff --git a/res/menu/compose_menu.xml b/res/menu/compose_menu.xml
index 6b564f5..2334422 100644
--- a/res/menu/compose_menu.xml
+++ b/res/menu/compose_menu.xml
@@ -22,21 +22,16 @@
         android:icon="@drawable/send"
         android:title="@string/send"/>
 
+    <item android:id="@+id/add_photo_attachment"
+          android:icon="@drawable/ic_attachment_holo_light"
+          android:title="@string/add_photo_attachment"
+          android:showAsAction="never" />
+
     <item android:id="@+id/add_file_attachment"
         android:icon="@drawable/ic_attachment_holo_light"
         android:title="@string/add_file_attachment"
         android:showAsAction="never" />
 
-    <item android:id="@+id/add_photo_attachment"
-        android:icon="@drawable/ic_attachment_holo_light"
-        android:title="@string/add_photo_attachment"
-        android:showAsAction="never" />
-
-    <item android:id="@+id/add_video_attachment"
-        android:icon="@drawable/ic_attachment_holo_light"
-        android:title="@string/add_video_attachment"
-        android:showAsAction="never" />
-
     <item android:id="@+id/add_cc_bcc"
         android:title="@string/add_cc_label"
         android:showAsAction="never"/>
diff --git a/src/com/android/mail/analytics/AnalyticsUtils.java b/src/com/android/mail/analytics/AnalyticsUtils.java
index 03bc162..a1c162e 100644
--- a/src/com/android/mail/analytics/AnalyticsUtils.java
+++ b/src/com/android/mail/analytics/AnalyticsUtils.java
@@ -95,8 +95,6 @@
             s = "show_original";
         } else if (id == R.id.add_photo_attachment) {
             s = "add_photo_attachment";
-        } else if (id == R.id.add_video_attachment) {
-            s = "add_video_attachment";
         } else if (id == R.id.add_cc_bcc) {
             s = "add_cc_bcc";
         } else if (id == R.id.save) {
diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index f51f917..b76fa42 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -228,7 +228,6 @@
     private static final String TAG_WAIT = "wait-fragment";
     private static final String MIME_TYPE_ALL = "*/*";
     private static final String MIME_TYPE_PHOTO = "image/*";
-    private static final String MIME_TYPE_VIDEO = "video/*";
 
     private static final String KEY_INNER_SAVED_STATE = "compose_state";
 
@@ -263,7 +262,6 @@
     private boolean mTextChanged;
     private boolean mReplyFromChanged;
     private MenuItem mSave;
-    private MenuItem mSend;
     @VisibleForTesting
     protected Message mRefMessage;
     private long mDraftId = UIProvider.INVALID_MESSAGE_ID;
@@ -271,7 +269,6 @@
     private ReplyFromAccount mDraftAccount;
     private Object mDraftLock = new Object();
     private View mPhotoAttachmentsButton;
-    private View mVideoAttachmentsButton;
 
     /**
      * Boolean indicating whether ComposeActivity was launched from a Gmail controlled view.
@@ -1988,7 +1985,6 @@
                             || Intent.ACTION_SENDTO.equals(action)
                             || shouldSave()));
 
-        mSend = menu.findItem(R.id.send);
         MenuItem helpItem = menu.findItem(R.id.help_info_menu_item);
         MenuItem sendFeedbackItem = menu.findItem(R.id.feedback_menu_item);
         if (helpItem != null) {
@@ -2000,8 +1996,8 @@
                     && mAccount.supportsCapability(AccountCapabilities.SEND_FEEDBACK));
         }
 
-        // Only show attach file on K. Sigh.
-        menu.findItem(R.id.add_file_attachment).setVisible(Utils.isRunningKitkatOrLater());
+        // Show attach picture on pre-K devices.
+        menu.findItem(R.id.add_photo_attachment).setVisible(!Utils.isRunningKitkatOrLater());
 
         return true;
     }
@@ -2035,8 +2031,6 @@
             doAttach(MIME_TYPE_ALL);
         } else if (id == R.id.add_photo_attachment) {
             doAttach(MIME_TYPE_PHOTO);
-        } else if (id == R.id.add_video_attachment) {
-            doAttach(MIME_TYPE_VIDEO);
         } else if (id == R.id.add_cc_bcc) {
             showCcBccViews();
         } else if (id == R.id.save) {