Switch to Light Holo theme, clean up menu options.

- Changed the default theme to Light.Holo
- MessageCompose now has ActionBar.
- Removed unnecessary MessageCompose menu items.

- Also removed "Add Account" menu from MessageListXL.
  (Use the + button on account settings)

- Fixed "calender response section invisible" bug.

Bug 2926517

Change-Id: Id27632ec82dad158f43b0903dbc2cb219188400d

2 files changed, 14 insertions, 36 deletions

diff --git a/res/menu/message_compose_option.xml b/res/menu/message_compose_option.xml
index 68ea54fc3..531ad2221 100644
--- a/res/menu/message_compose_option.xml
+++ b/res/menu/message_compose_option.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,34 +15,18 @@
 -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:id="@+id/add_cc_bcc"
+    <item
+        android:id="@+id/add_cc_bcc"
         android:alphabeticShortcut="c"
-		android:title="@string/add_cc_bcc_action"
-		android:icon="@drawable/ic_menu_cc"
-	/>
-	<item
-		android:id="@+id/send"
-        android:alphabeticShortcut="s"
-		android:title="@string/send_action"
-		android:icon="@android:drawable/ic_menu_send"
-	/>
-	<item
-		android:id="@+id/save"
-        android:alphabeticShortcut="d"
-		android:title="@string/save_draft_action"
-		android:icon="@drawable/ic_menu_save_draft"
-	/>
-	<item
-		android:id="@+id/discard"
-        android:alphabeticShortcut="q"
-		android:title="@string/discard_action"
-		android:icon="@android:drawable/ic_menu_close_clear_cancel"
-	/>
-	<item
-		android:id="@+id/add_attachment"
+        android:title="@string/add_cc_bcc_action"
+        android:icon="@drawable/ic_menu_cc"
+        android:showAsAction="always"
+    />
+    <item
+        android:id="@+id/add_attachment"
         android:alphabeticShortcut="n"
-		android:title="@string/add_attachment_action"
-		android:icon="@drawable/ic_menu_attachment"
-	/>
+        android:title="@string/add_attachment_action"
+        android:icon="@drawable/ic_menu_attachment"
+        android:showAsAction="always"
+    />
 </menu>
diff --git a/res/menu/message_list_xl_option.xml b/res/menu/message_list_xl_option.xml
index 4af504087..d1698e8ac 100644
--- a/res/menu/message_list_xl_option.xml
+++ b/res/menu/message_list_xl_option.xml
@@ -31,12 +31,6 @@
         android:title="@string/account_settings_action"
         android:icon="@android:drawable/ic_menu_preferences"
     />
-    <!-- STOPSHIP: Dev version only.  Remove this. -->
-    <item android:id="@+id/add_new_account"
-        android:title="@string/add_account_action"
-        android:icon="@android:drawable/ic_menu_add"
-    />
-    <!-- STOPSHIP: Dev version only.  Remove this. -->
     <item android:id="@+id/change_orientation"
         android:title="@string/menu_change_orientation"
     />