Updating UI of 'email attendees' feature.
Moving away from a button in the title bar, to one in the body of the event info.
Change-Id: I775a49c45a9705312482f123b105f378b77d4e27
diff --git a/res/drawable-hdpi/ic_menu_email_holo_light.png b/res/drawable-hdpi/ic_menu_email_holo_light.png
index b590822..5a79930 100644
--- a/res/drawable-hdpi/ic_menu_email_holo_light.png
+++ b/res/drawable-hdpi/ic_menu_email_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_email_holo_light.png b/res/drawable-mdpi/ic_menu_email_holo_light.png
index 4f194f8..b854991 100644
--- a/res/drawable-mdpi/ic_menu_email_holo_light.png
+++ b/res/drawable-mdpi/ic_menu_email_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_email_holo_light.png b/res/drawable-xhdpi/ic_menu_email_holo_light.png
index a2d821a..3443f0b 100644
--- a/res/drawable-xhdpi/ic_menu_email_holo_light.png
+++ b/res/drawable-xhdpi/ic_menu_email_holo_light.png
Binary files differ
diff --git a/res/layout/event_info.xml b/res/layout/event_info.xml
index c1bd468..e333546 100644
--- a/res/layout/event_info.xml
+++ b/res/layout/event_info.xml
@@ -209,10 +209,10 @@
android:id="@+id/response_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:minHeight="52dip"
android:layout_gravity="center_vertical"
android:paddingLeft="8dip"
android:paddingRight="8dip"
- android:layout_marginTop="5dip"
android:orientation="horizontal">
<RadioButton
android:id="@+id/response_yes"
@@ -250,6 +250,39 @@
</RadioGroup>
</LinearLayout>
+ <!-- EMAIL GUESTS -->
+ <LinearLayout
+ android:id="@+id/email_attendees_container"
+ android:visibility="gone"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <View
+ android:background="?android:attr/listDivider"
+ android:layout_height="1px"
+ android:layout_width="match_parent"
+ android:layout_marginLeft="8dip"
+ android:layout_marginRight="8dip" />
+ <Button
+ android:id="@+id/email_attendees_button"
+ android:text="@string/email_guests_label"
+ android:layout_height="50dp"
+ android:layout_width="match_parent"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
+ android:gravity="center_vertical"
+ android:paddingBottom="0dp"
+ android:layout_marginTop="0dip"
+ android:layout_marginBottom="0dip"
+ android:textAllCaps="false"
+ android:textSize="16sp"
+ android:textColor="#777777"
+ android:background="?android:attr/selectableItemBackground"
+ android:drawableLeft="@drawable/event_info_mail_button"
+ android:drawablePadding="8dp"
+ style="@style/TextAppearance.EditEvent_LabelSmall" />
+ </LinearLayout>
+
<!-- GUEST LIST -->
<com.android.calendar.event.AttendeesView
android:id="@+id/long_attendee_list"
@@ -287,8 +320,9 @@
android:id="@+id/reminder_add"
android:text="@string/reminders_label"
android:layout_height="wrap_content"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
android:layout_gravity="center_vertical"
android:gravity="top"
android:paddingBottom="12dp"
diff --git a/res/layout/event_info_dialog.xml b/res/layout/event_info_dialog.xml
index c625ad9..7863378 100644
--- a/res/layout/event_info_dialog.xml
+++ b/res/layout/event_info_dialog.xml
@@ -103,17 +103,6 @@
style="?android:attr/buttonBarButtonStyle"
android:background="@drawable/event_info_compose_button" />
<Button
- android:id="@+id/mail"
- android:layout_width="32dip"
- android:layout_height="32dip"
- android:layout_weight="1"
- android:layout_marginTop="8dip"
- android:layout_marginRight="16dip"
- android:enabled="false"
- android:visibility="gone"
- style="?android:attr/buttonBarButtonStyle"
- android:background="@drawable/event_info_mail_button" />
- <Button
android:id="@+id/delete"
android:layout_width="32dip"
android:layout_height="32dip"
@@ -213,7 +202,7 @@
<TextView
android:id="@+id/response_label"
android:layout_width="match_parent"
- android:layout_height="32dip"
+ android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingLeft="8dip"
android:paddingRight="16dip"
@@ -227,9 +216,8 @@
android:id="@+id/response_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:minHeight="52dip"
android:layout_gravity="center_vertical"
- android:layout_marginTop="8dip"
- android:layout_marginBottom="8dip"
android:paddingLeft="9dip"
android:orientation="horizontal">
<RadioButton
@@ -237,6 +225,7 @@
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
+ android:layout_gravity="center_vertical"
android:minWidth="96dip"
style="?android:attr/textAppearanceMedium"
android:textColor="@color/event_info_body_color"
@@ -246,6 +235,7 @@
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
+ android:layout_gravity="center_vertical"
android:minWidth="96dip"
style="?android:attr/textAppearanceMedium"
android:textColor="@color/event_info_body_color"
@@ -255,12 +245,48 @@
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
+ android:layout_gravity="center_vertical"
android:minWidth="96dip"
style="?android:attr/textAppearanceMedium"
android:textColor="@color/event_info_body_color"
android:text="@string/response_no" />
</RadioGroup>
</LinearLayout>
+
+ <!-- EMAIL GUESTS -->
+ <LinearLayout
+ android:id="@+id/email_attendees_container"
+ android:visibility="gone"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <View
+ android:background="?android:attr/listDivider"
+ android:layout_height="1px"
+ android:layout_width="match_parent"
+ android:layout_marginLeft="8dip"
+ android:layout_marginRight="0dip" />
+ <Button
+ android:id="@+id/email_attendees_button"
+ android:text="@string/email_guests_label"
+ android:layout_height="50dp"
+ android:layout_width="match_parent"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="0dp"
+ android:layout_gravity="left"
+ android:gravity="center_vertical"
+ android:paddingBottom="0dp"
+ android:layout_marginTop="0dip"
+ android:layout_marginBottom="0dip"
+ android:textAllCaps="false"
+ android:textSize="16sp"
+ android:textColor="#777777"
+ android:background="?android:attr/selectableItemBackground"
+ android:drawableLeft="@drawable/event_info_mail_button"
+ android:drawablePadding="8dp"
+ style="@style/TextAppearance.EditEvent_LabelSmall" />
+ </LinearLayout>
+
<!-- GUEST LIST -->
<com.android.calendar.event.AttendeesView
android:id="@+id/long_attendee_list"
@@ -301,8 +327,9 @@
android:id="@+id/reminder_add"
android:text="@string/reminders_label"
android:layout_height="wrap_content"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_marginLeft="8dp"
+ android:layout_marginRight="0dp"
android:layout_marginBottom="-6dp"
android:gravity="center_vertical|left"
android:textSize="18sp"
diff --git a/res/menu/event_info_title_bar.xml b/res/menu/event_info_title_bar.xml
index ebae757..d2a3eec 100644
--- a/res/menu/event_info_title_bar.xml
+++ b/res/menu/event_info_title_bar.xml
@@ -23,13 +23,6 @@
android:showAsAction="withText|always"
android:enabled="false"
android:visible="false" />
- <item android:id="@+id/info_action_mail"
- android:alphabeticShortcut="m"
- android:title="@string/email_attendees_label"
- android:icon="@drawable/ic_menu_email_holo_light"
- android:showAsAction="withText|always"
- android:enabled="false"
- android:visible="false" />
<item android:id="@+id/info_action_delete"
android:alphabeticShortcut="x"
android:title="@string/delete_label"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b1de4f1..72caa86 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -271,7 +271,7 @@
<!-- Response for whether attending an event - declined [CHAR LIMIT=10]-->
<string name="response_no">No</string>
<!-- Label for emailing attendees -->
- <string name="email_attendees_label">Mail</string>
+ <string name="email_guests_label">Email guests</string>
<!-- This is shown in the popup picker when emailing attendees -->
<string name="email_picker_label">Email with</string>
<!-- The is shown in the email subject as the prefix appended to the event title -->
