Merge "Don't clear associated views before snapping them back to position." into jb-ub-mail
diff --git a/res/layout/compose.xml b/res/layout/compose.xml
index 5d786ca..e887068 100644
--- a/res/layout/compose.xml
+++ b/res/layout/compose.xml
@@ -18,7 +18,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="match_parent"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:background="@android:color/white">
<ScrollView
android:id="@+id/compose_scrollview"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a2fb47c..a084da5 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -39,9 +39,9 @@
<!-- Compose colors -->
<color name="compose_label_text">#aaaaaa</color>
<color name="quoted_text_color">#777777</color>
- <string name="quoted_text_background_color_string" translatable="false">#ebebeb</string>
+ <string name="quoted_text_background_color_string" translatable="false">@android:color/white</string>
<!-- Must match the quoted_text_background_color_string -->
- <color name="compose_background_color">#ebebeb</color>
+ <color name="compose_background_color">@android:color/white</color>
<string name="quoted_text_font_color_string" translatable="false">#777777</string>
<color name="conv_header_add_label_text">@android:color/black</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8192367..30e0eb8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -51,13 +51,14 @@
</style>
<style name="ComposeFieldLayout" parent="android:Widget.Holo.Light.EditText">
- <item name="android:layout_height">wrap_content</item>
- <item name="android:layout_width">match_parent</item>
<item name="android:addStatesFromChildren">true</item>
<item name="android:focusable">false</item>
<item name="android:focusableInTouchMode">false</item>
- <item name="android:gravity">center_vertical</item>
- <item name="android:paddingTop">0dip</item>
+ <item name="android:orientation">horizontal</item>
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:minHeight">48dip</item>
+ <item name="android:clickable">true</item>
</style>
<style name="RecipientComposeFieldLayout" parent="@style/ComposeFieldLayout">
diff --git a/src/com/android/mail/compose/FromAddressSpinnerAdapter.java b/src/com/android/mail/compose/FromAddressSpinnerAdapter.java
index 512daa6..6ea8e7d 100644
--- a/src/com/android/mail/compose/FromAddressSpinnerAdapter.java
+++ b/src/com/android/mail/compose/FromAddressSpinnerAdapter.java
@@ -80,7 +80,7 @@
((TextView) fromEntry.findViewById(R.id.spinner_account_name)).setText(fromItem.name);
if (fromItem.isCustomFrom) {
((TextView) fromEntry.findViewById(R.id.spinner_account_address))
- .setText(fromItem.address);
+ .setText(formatAddress(fromItem.address));
}
return fromEntry;
}
@@ -100,7 +100,7 @@
return fromEntry;
}
- private CharSequence formatAddress(String address) {
+ private static CharSequence formatAddress(String address) {
if (TextUtils.isEmpty(address)) {
return "";
}