[Quantum compose] fix compose from colors

Fix compose from field colors to correct color.

b/16738304

Change-Id: I94fed43d05179952f5540951c5d142f2942c3f7a

5 files changed, 19 insertions, 37 deletions

diff --git a/res/layout/compose_from.xml b/res/layout/compose_from.xml
index fc757150e..c3d4cb157 100644
--- a/res/layout/compose_from.xml
+++ b/res/layout/compose_from.xml
@@ -60,12 +60,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:background="@android:color/transparent"
-                    android:ellipsize="end"
-                    android:gravity="center_vertical"
-                    android:singleLine="true"
                     android:textAlignment="viewStart"
-                    android:textColor="@color/compose_user_text"
-                    android:textSize="@dimen/compose_header_text_size" />
+                    style="@style/ComposeFromTextViewStyle" />
 
             </LinearLayout>
 
diff --git a/res/layout/custom_from_dropdown_item.xml b/res/layout/custom_from_dropdown_item.xml
index ed7de3637..bf910082b 100644
--- a/res/layout/custom_from_dropdown_item.xml
+++ b/res/layout/custom_from_dropdown_item.xml
@@ -17,35 +17,31 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="wrap_content"
     android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:layout_gravity="center_vertical"
     android:orientation="vertical"
-    android:paddingTop="10dip"
-    android:paddingBottom="10dip"
-    android:paddingLeft="24dip"
-    android:paddingRight="24dip">
+    android:paddingTop="10dp"
+    android:paddingBottom="10dp"
+    android:paddingLeft="24dp"
+    android:paddingRight="24dp">
 
     <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content">
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
 
       <TextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:singleLine="true"
           android:text="@string/custom_from_account_label"
-          android:textAppearance="?android:attr/textAppearanceMedium"
           style="@style/SendMailStyle" />
 
       <TextView
           android:id="@+id/spinner_account_name"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:ellipsize="end"
-          android:singleLine="true"
           android:textAlignment="viewStart"
-          android:textAppearance="?android:attr/textAppearanceMedium" />
+          style="@style/ComposeFromTextViewStyle" />
 
     </LinearLayout>
 
@@ -53,8 +49,7 @@
         android:id="@+id/spinner_account_address"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:singleLine="true"
         android:textAlignment="viewStart"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        style="@style/ComposeFromTextViewStyle" />
 
 </LinearLayout>
diff --git a/res/layout/custom_from_item.xml b/res/layout/custom_from_item.xml
index 5b693d58b..c79314251 100644
--- a/res/layout/custom_from_item.xml
+++ b/res/layout/custom_from_item.xml
@@ -18,26 +18,20 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="match_parent">
 
     <TextView
         android:id="@+id/spinner_account_name"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:ellipsize="end"
-        android:gravity="center_vertical"
-        android:singleLine="true"
+        android:layout_height="wrap_content"
         android:textAlignment="viewStart"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        style="@style/ComposeFromTextViewStyle" />
 
     <TextView
         android:id="@+id/spinner_account_address"
         android:layout_width="0dp"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:ellipsize="end"
-        android:gravity="center_vertical"
-        android:singleLine="true"
         android:textAlignment="viewStart"
         style="@style/SpinnerAccountAddressStyle" />
 
diff --git a/res/layout/from_dropdown_item.xml b/res/layout/from_dropdown_item.xml
index 054068d55..7d75fab65 100644
--- a/res/layout/from_dropdown_item.xml
+++ b/res/layout/from_dropdown_item.xml
@@ -16,8 +16,8 @@
      limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <TextView
         android:id="@+id/spinner_account_address"
@@ -27,8 +27,7 @@
         android:gravity="center_vertical"
         android:paddingLeft="8dip"
         android:paddingRight="8dip"
-        android:singleLine="true"
         android:textAlignment="viewStart"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        style="@style/ComposeFromTextViewStyle" />
 
 </LinearLayout>
diff --git a/res/layout/from_item.xml b/res/layout/from_item.xml
index 61e8bb7d2..027d1a632 100644
--- a/res/layout/from_item.xml
+++ b/res/layout/from_item.xml
@@ -22,13 +22,11 @@
     <TextView
         android:id="@+id/spinner_account_address"
         android:layout_width="0dp"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:ellipsize="end"
-        android:gravity="center_vertical"
         android:singleLine="true"
         android:textAlignment="viewStart"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        style="@style/ComposeFromTextViewStyle" />
 
     <ImageView
         android:src="@drawable/ic_expand_more_24dp"