Integrate chips into Email.

Change-Id: Ice037a55a169037f725a667fad7714c7e9580b86

5 files changed, 64 insertions, 33 deletions

diff --git a/res/drawable-hdpi/ic_contact_picture.png b/res/drawable-hdpi/ic_contact_picture.png
deleted file mode 100644
index 31953dd57..000000000
--- a/res/drawable-hdpi/ic_contact_picture.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_contact_picture.png b/res/drawable-mdpi/ic_contact_picture.png
deleted file mode 100644
index ff6c61a28..000000000
--- a/res/drawable-mdpi/ic_contact_picture.png
+++ /dev/null
diff --git a/res/layout-v14/address_text_view.xml b/res/layout-v14/address_text_view.xml
new file mode 100644
index 000000000..ca9182400
--- /dev/null
+++ b/res/layout-v14/address_text_view.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.email.activity.ChipsAddressTextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:textAppearance="?android:attr/textAppearanceMedium"
+    android:textColor="?android:attr/textColorSecondary"
+    android:inputType="textEmailAddress|textMultiLine"
+    android:imeOptions="actionNext"
+    android:layout_weight="1" />
\ No newline at end of file
diff --git a/res/layout/address_text_view.xml b/res/layout/address_text_view.xml
new file mode 100644
index 000000000..ccae747ea
--- /dev/null
+++ b/res/layout/address_text_view.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.email.activity.AddressTextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:textAppearance="?android:attr/textAppearanceMedium"
+    android:textColor="?android:attr/textColorSecondary"
+    android:inputType="textEmailAddress|textMultiLine"
+    android:imeOptions="actionNext"
+    android:layout_weight="1" />
\ No newline at end of file
diff --git a/res/layout/message_compose.xml b/res/layout/message_compose.xml
index 56f1adebd..de644c3d9 100644
--- a/res/layout/message_compose.xml
+++ b/res/layout/message_compose.xml
@@ -39,19 +39,16 @@
                 <LinearLayout
                     android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <com.android.email.activity.AddressTextView
-                        android:id="@+id/to"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="6dip"
+                    android:layout_marginRight="6dip">
+
+                    <include android:id="@+id/to"
+                        layout="@layout/address_text_view"
                         android:layout_width="0dip"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:layout_marginLeft="6dip"
-                        android:layout_marginRight="6dip"
-                        android:inputType="textEmailAddress|textMultiLine"
-                        android:imeOptions="actionNext"
-                        android:hint="@string/message_compose_to_hint" />
+                        android:layout_weight="1" />
+
                     <ImageView
                         android:id="@+id/add_cc_bcc"
                         android:layout_height="wrap_content"
@@ -64,29 +61,17 @@
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
                     android:visibility="gone"
+                    android:layout_marginLeft="6dip"
+                    android:layout_marginRight="6dip"
                     >
-                    <com.android.email.activity.AddressTextView
-                        android:id="@+id/cc" android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:layout_marginLeft="6dip"
-                        android:layout_marginRight="6dip"
-                        android:inputType="textEmailAddress|textMultiLine"
-                        android:imeOptions="actionNext"
-                        android:hint="@string/message_compose_cc_hint"
-                        />
-                    <com.android.email.activity.AddressTextView
-                        android:id="@+id/bcc" android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:textColor="?android:attr/textColorSecondary"
-                        android:layout_marginLeft="6dip"
-                        android:layout_marginRight="6dip"
-                        android:inputType="textEmailAddress|textMultiLine"
-                        android:imeOptions="actionNext"
-                        android:hint="@string/message_compose_bcc_hint"
-                        />
+                    <include android:id="@+id/cc"
+                        layout="@layout/address_text_view"
+                        android:layout_width="match_parent"               
+                        android:layout_height="wrap_content" />
+                    <include android:id="@+id/bcc"
+                        layout="@layout/address_text_view"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
                 </LinearLayout>
                 <LinearLayout
                     android:orientation="horizontal"