Merge "Updated anonymous avatar." into ub-gmail-ur14-dev
diff --git a/res/layout/compose_attachment_tile.xml b/res/layout/compose_attachment_tile.xml
index aa68328..f3496f8 100644
--- a/res/layout/compose_attachment_tile.xml
+++ b/res/layout/compose_attachment_tile.xml
@@ -76,7 +76,6 @@
android:layout_width="44dip"
android:layout_height="44dip"
android:layout_gravity="center_vertical|end|right"
- android:contentDescription="@string/remove_attachment_desc"
android:gravity="center"
android:focusable="true"
android:background="?android:attr/selectableItemBackground" />
diff --git a/src/com/android/mail/compose/ComposeAttachmentTile.java b/src/com/android/mail/compose/ComposeAttachmentTile.java
index 844a7a3..f0f4459 100644
--- a/src/com/android/mail/compose/ComposeAttachmentTile.java
+++ b/src/com/android/mail/compose/ComposeAttachmentTile.java
@@ -33,6 +33,8 @@
public void render(Attachment attachment, AttachmentPreviewCache attachmentPreviewCache) {
// the super implementation is good enough. just broaden its access.
super.render(attachment, attachmentPreviewCache);
+ mDeleteButton.setContentDescription(
+ getResources().getString(R.string.remove_attachment_desc, attachment.getName()));
}
@Override