Merge "Move values over from mailcommon to unifiedemail." into jb-ub-mail
diff --git a/res/layout/attachment.xml b/res/layout/attachment.xml
index 81880f3..dfb4f43 100644
--- a/res/layout/attachment.xml
+++ b/res/layout/attachment.xml
@@ -52,14 +52,16 @@
</LinearLayout>
<!-- Remove button -->
- <ImageView android:id="@+id/remove_attachment"
+ <ImageButton android:id="@+id/remove_attachment"
android:src="@drawable/ic_cancel_holo_light"
- android:layout_width="24dip"
- android:layout_height="24dip"
+ android:layout_width="32dp"
+ android:layout_height="match_parent"
android:layout_alignParentRight="true"
- android:layout_marginRight="8dip"
+ android:paddingRight="8dip"
+ android:paddingLeft="8dip"
android:clickable="true"
- android:layout_centerVertical="true"/>
+ android:layout_centerVertical="true"
+ android:background="?android:attr/selectableItemBackground"/>
</RelativeLayout>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index d987daf..5afd7cd 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -115,8 +115,7 @@
<string name="please_wait" msgid="8797634225088247121">"Моля, изчакайте…"</string>
<string name="saved" msgid="6977782468220926548">"Запазено,"</string>
<string name="download_failed" msgid="7860650496473302012">"Не се изтегли."</string>
- <!-- no translation found for attachments_header (6459475590011460229) -->
- <skip />
+ <string name="attachments_header" msgid="6459475590011460229">"Прикачени файлове"</string>
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Споделяне чрез"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Отваряне в браузъра"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Копиране"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index de2e7f2..a778060 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -115,8 +115,7 @@
<string name="please_wait" msgid="8797634225088247121">"Čekejte prosím…"</string>
<string name="saved" msgid="6977782468220926548">"Uloženo,"</string>
<string name="download_failed" msgid="7860650496473302012">"Stažení se nezdařilo"</string>
- <!-- no translation found for attachments_header (6459475590011460229) -->
- <skip />
+ <string name="attachments_header" msgid="6459475590011460229">"Přílohy"</string>
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Sdílet pomocí"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Otevřít v prohlížeči"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Kopírovat"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 552fc3f..2175cb6 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -115,8 +115,7 @@
<string name="please_wait" msgid="8797634225088247121">"Aguarda…"</string>
<string name="saved" msgid="6977782468220926548">"Guardado"</string>
<string name="download_failed" msgid="7860650496473302012">"Error al descargar"</string>
- <!-- no translation found for attachments_header (6459475590011460229) -->
- <skip />
+ <string name="attachments_header" msgid="6459475590011460229">"Archivos adjuntos"</string>
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Compartir mediante"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Abrir en el navegador"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Copiar"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index e25e03d..ef1abca 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -115,8 +115,7 @@
<string name="please_wait" msgid="8797634225088247121">"Vent litt …"</string>
<string name="saved" msgid="6977782468220926548">"Lagret"</string>
<string name="download_failed" msgid="7860650496473302012">"Kunne ikke laste ned."</string>
- <!-- no translation found for attachments_header (6459475590011460229) -->
- <skip />
+ <string name="attachments_header" msgid="6459475590011460229">"Vedlegg"</string>
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Del på"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Åpne i nettleser"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Kopiér"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ae89fca..7c10a3d 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -115,8 +115,7 @@
<string name="please_wait" msgid="8797634225088247121">"Aşteptaţi…"</string>
<string name="saved" msgid="6977782468220926548">"Salvat,"</string>
<string name="download_failed" msgid="7860650496473302012">"Descărcare eşuată."</string>
- <!-- no translation found for attachments_header (6459475590011460229) -->
- <skip />
+ <string name="attachments_header" msgid="6459475590011460229">"Ataşări"</string>
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Distribuiţi prin"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Deschideţi în browser"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Copiaţi"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index a94e809..79fef01 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -115,8 +115,7 @@
<string name="please_wait" msgid="8797634225088247121">"Čakajte prosím..."</string>
<string name="saved" msgid="6977782468220926548">"Uložené,"</string>
<string name="download_failed" msgid="7860650496473302012">"Nepodarilo sa prevziať."</string>
- <!-- no translation found for attachments_header (6459475590011460229) -->
- <skip />
+ <string name="attachments_header" msgid="6459475590011460229">"Prílohy"</string>
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Zdieľať prostredníctvom"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Otvoriť v prehliadači"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Kopírovať"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 2f7ec29..e39a2fc 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -115,8 +115,7 @@
<string name="please_wait" msgid="8797634225088247121">"請稍候…"</string>
<string name="saved" msgid="6977782468220926548">"已儲存，"</string>
<string name="download_failed" msgid="7860650496473302012">"無法下載。"</string>
- <!-- no translation found for attachments_header (6459475590011460229) -->
- <skip />
+ <string name="attachments_header" msgid="6459475590011460229">"附件"</string>
<string name="choosertitle_sharevia" msgid="6142681649048665134">"分享方式"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"在瀏覽器中開啟"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"複製"</string>
diff --git a/src/com/android/mail/compose/AttachmentComposeView.java b/src/com/android/mail/compose/AttachmentComposeView.java
index 42f179e..783b601 100644
--- a/src/com/android/mail/compose/AttachmentComposeView.java
+++ b/src/com/android/mail/compose/AttachmentComposeView.java
@@ -18,7 +18,7 @@
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
-import android.widget.ImageView;
+import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -58,7 +58,7 @@
}
public void addDeleteListener(OnClickListener clickListener) {
- ImageView deleteButton = (ImageView) findViewById(R.id.remove_attachment);
+ ImageButton deleteButton = (ImageButton) findViewById(R.id.remove_attachment);
deleteButton.setOnClickListener(clickListener);
}
diff --git a/src/com/android/mail/compose/QuotedTextView.java b/src/com/android/mail/compose/QuotedTextView.java
index 6fe5c29..7c552cb 100644
--- a/src/com/android/mail/compose/QuotedTextView.java
+++ b/src/com/android/mail/compose/QuotedTextView.java
@@ -111,7 +111,7 @@
public void allowQuotedText(boolean allow) {
View quotedTextRow = findViewById(R.id.quoted_text_row);
if (quotedTextRow != null) {
- quotedTextRow.setVisibility(allow? View.VISIBLE: View.GONE);
+ quotedTextRow.setVisibility(allow? View.VISIBLE: View.INVISIBLE);
}
}