From 87763f0ae851c76d5e7cf672a6e3acf21705549c Mon Sep 17 00:00:00 2001
From: Mindy Pereira <mindyp@google.com>
Date: Wed, 15 Jun 2011 19:35:15 -0700
Subject: [PATCH] Integrate chips into Email.

Change-Id: Ice037a55a169037f725a667fad7714c7e9580b86
---
 Android.mk                                    |   7 +-
 res/drawable-hdpi/ic_contact_picture.png      | Bin 2270 -> 0 bytes
 res/drawable-mdpi/ic_contact_picture.png      | Bin 1553 -> 0 bytes
 res/layout-v14/address_text_view.xml          |  23 ++++++
 res/layout/address_text_view.xml              |  23 ++++++
 res/layout/message_compose.xml                |  51 +++++-------
 .../android/email/EmailAddressAdapter.java    |   3 +-
 src/com/android/email/RecipientAdapter.java   |  75 ++++++++++++++++++
 .../email/activity/ChipsAddressTextView.java  |  75 ++++++++++++++++++
 .../email/activity/MessageCompose.java        |  65 ++++++++++-----
 10 files changed, 269 insertions(+), 53 deletions(-)
 delete mode 100644 res/drawable-hdpi/ic_contact_picture.png
 delete mode 100644 res/drawable-mdpi/ic_contact_picture.png
 create mode 100644 res/layout-v14/address_text_view.xml
 create mode 100644 res/layout/address_text_view.xml
 create mode 100644 src/com/android/email/RecipientAdapter.java
 create mode 100644 src/com/android/email/activity/ChipsAddressTextView.java

diff --git a/Android.mk b/Android.mk
index 8dd6784d8..d586615e4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,12 +18,17 @@ LOCAL_PATH := $(call my-dir)
 # static library.  All tests can be run via runtest email
 
 include $(CLEAR_VARS)
+# Include res dir from chips
+chips_dir := ../../../frameworks/ex/chips/res
+res_dir := $(chips_dir) res
 
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src/com/android/email)
 LOCAL_SRC_FILES += $(call all-java-files-under, src/com/beetstra)
-LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon guava
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon guava android-common-chips
 
 LOCAL_PACKAGE_NAME := Email
 
diff --git a/res/drawable-hdpi/ic_contact_picture.png b/res/drawable-hdpi/ic_contact_picture.png
deleted file mode 100644
index 31953dd579ba15450163cab62b4d42307a2c0522..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2270
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

diff --git a/res/drawable-mdpi/ic_contact_picture.png b/res/drawable-mdpi/ic_contact_picture.png
deleted file mode 100644
index ff6c61a28d882d34ffb64dfba3f6b24a281a78ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1553
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

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"
diff --git a/src/com/android/email/EmailAddressAdapter.java b/src/com/android/email/EmailAddressAdapter.java
index cd41becc3..1c07101b3 100644
--- a/src/com/android/email/EmailAddressAdapter.java
+++ b/src/com/android/email/EmailAddressAdapter.java
@@ -18,6 +18,7 @@ package com.android.email;
 
 import com.android.common.contacts.BaseEmailAddressAdapter;
 import com.android.emailcommon.provider.Account;
+import com.android.ex.chips.AccountSpecifier;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -31,7 +32,7 @@ import android.widget.TextView;
  * purpose of the class is to bind the generic implementation to the resources
  * defined locally: strings and layouts.
  */
-public class EmailAddressAdapter extends BaseEmailAddressAdapter {
+public class EmailAddressAdapter extends BaseEmailAddressAdapter implements AccountSpecifier {
 
     private LayoutInflater mInflater;
 
diff --git a/src/com/android/email/RecipientAdapter.java b/src/com/android/email/RecipientAdapter.java
new file mode 100644
index 000000000..38caabeb4
--- /dev/null
+++ b/src/com/android/email/RecipientAdapter.java
@@ -0,0 +1,75 @@
+/*
+ * 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.
+ */
+
+package com.android.email;
+
+import com.android.ex.chips.BaseRecipientAdapter;
+import com.android.ex.chips.RecipientEditTextView;
+
+import android.accounts.Account;
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+
+public class RecipientAdapter extends BaseRecipientAdapter {
+    public RecipientAdapter(Context context, RecipientEditTextView list) {
+        super(context);
+        Resources r = context.getResources();
+        Bitmap def = BitmapFactory.decodeResource(r, R.drawable.ic_contact_picture);
+        list.setChipDimensions(
+                r.getDrawable(R.drawable.chip_background),
+                r.getDrawable(R.drawable.chip_background_selected),
+                r.getDrawable(R.drawable.chip_background_invalid),
+                r.getDrawable(R.drawable.chip_delete), def, R.string.more_string,
+                R.layout.chips_alternate_item,
+                        r.getDimension(R.dimen.chip_height),
+                        r.getDimension(R.dimen.chip_padding),
+                        r.getDimension(R.dimen.chip_text_size));
+    }
+
+    /**
+     * Set the account when known. Causes the search to prioritize contacts from
+     * that account.
+     */
+    public void setAccount(Account account) {
+        if (account != null) {
+            // TODO: figure out how to infer the contacts account
+            // type from the email account
+            super.setAccount(new android.accounts.Account(account.name, "unknown"));
+        }
+    }
+
+    @Override
+    protected int getDefaultPhotoResource() {
+        return R.drawable.ic_contact_picture;
+    }
+
+    @Override
+    protected int getItemLayout() {
+        return R.layout.chips_recipient_dropdown_item;
+    }
+
+    @Override
+    protected int getSeparatorLayout() {
+        return R.layout.chips_separator;
+    }
+
+    @Override
+    protected int getSeparatorWithinGroupLayout() {
+        return R.layout.chips_separator_within_group;
+    }
+}
diff --git a/src/com/android/email/activity/ChipsAddressTextView.java b/src/com/android/email/activity/ChipsAddressTextView.java
new file mode 100644
index 000000000..43c036433
--- /dev/null
+++ b/src/com/android/email/activity/ChipsAddressTextView.java
@@ -0,0 +1,75 @@
+/*
+ * 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.
+ */
+
+package com.android.email.activity;
+
+import com.android.email.R;
+import com.android.ex.chips.RecipientEditTextView;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.MultiAutoCompleteTextView;
+
+/**
+ * This is a MultiAutoCompleteTextView which sets the error state
+ * (@see TextView.setError) when email address validation fails.
+ */
+class ChipsAddressTextView extends RecipientEditTextView {
+    private class ForwardValidator implements Validator {
+        private Validator mValidator = null;
+
+        public CharSequence fixText(CharSequence invalidText) {
+            mIsValid = false;
+            return invalidText;
+        }
+
+        public boolean isValid(CharSequence text) {
+            return mValidator != null ? mValidator.isValid(text) : true;
+        }
+
+        public void setValidator(Validator validator) {
+            mValidator = validator;
+        }
+    }
+
+    private boolean mIsValid = true;
+    private final ForwardValidator mInternalValidator = new ForwardValidator();
+
+    public ChipsAddressTextView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        super.setValidator(mInternalValidator);
+    }
+
+    @Override
+    public void setValidator(Validator validator) {
+        mInternalValidator.setValidator(validator);
+    }
+
+    @Override
+    public void performValidation() {
+        mIsValid = true;
+        super.performValidation();
+        markError(!mIsValid);
+    }
+
+    private void markError(boolean enable) {
+        if (enable) {
+            setError(getContext().getString(R.string.message_compose_error_invalid_email));
+        } else {
+            setError(null);
+        }
+    }
+}
diff --git a/src/com/android/email/activity/MessageCompose.java b/src/com/android/email/activity/MessageCompose.java
index 59e2b7dbc..2835d9822 100644
--- a/src/com/android/email/activity/MessageCompose.java
+++ b/src/com/android/email/activity/MessageCompose.java
@@ -22,6 +22,7 @@ import com.android.email.Email;
 import com.android.email.EmailAddressAdapter;
 import com.android.email.EmailAddressValidator;
 import com.android.email.R;
+import com.android.email.RecipientAdapter;
 import com.android.email.mail.internet.EmailHtmlUtil;
 import com.android.emailcommon.Logging;
 import com.android.emailcommon.internet.MimeUtility;
@@ -36,6 +37,10 @@ import com.android.emailcommon.provider.Mailbox;
 import com.android.emailcommon.utility.AttachmentUtilities;
 import com.android.emailcommon.utility.EmailAsyncTask;
 import com.android.emailcommon.utility.Utility;
+import com.android.ex.chips.AccountSpecifier;
+import com.android.ex.chips.BaseRecipientAdapter;
+import com.android.ex.chips.ChipsUtil;
+import com.android.ex.chips.RecipientEditTextView;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Objects;
 import com.google.common.collect.Lists;
@@ -200,9 +205,9 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
     private boolean mMessageLoaded;
     private final EmailAsyncTask.Tracker mTaskTracker = new EmailAsyncTask.Tracker();
 
-    private EmailAddressAdapter mAddressAdapterTo;
-    private EmailAddressAdapter mAddressAdapterCc;
-    private EmailAddressAdapter mAddressAdapterBcc;
+    private AccountSpecifier mAddressAdapterTo;
+    private AccountSpecifier mAddressAdapterCc;
+    private AccountSpecifier mAddressAdapterBcc;
 
     private static Intent getBaseIntent(Context context) {
         Intent i = new Intent(context, MessageCompose.class);
@@ -322,9 +327,12 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
             throw new IllegalArgumentException();
         }
         mAccount = account;
-        mAddressAdapterTo.setAccount(account);
-        mAddressAdapterCc.setAccount(account);
-        mAddressAdapterBcc.setAccount(account);
+        mAddressAdapterTo
+                .setAccount(new android.accounts.Account(account.mEmailAddress, "unknown"));
+        mAddressAdapterCc
+                .setAccount(new android.accounts.Account(account.mEmailAddress, "unknown"));
+        mAddressAdapterBcc
+                .setAccount(new android.accounts.Account(account.mEmailAddress, "unknown"));
 
         if (mFromView != null) {
             // Some configurations don't show the from field.
@@ -446,14 +454,14 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
 
         mTaskTracker.cancellAllInterrupt();
 
-        if (mAddressAdapterTo != null) {
-            mAddressAdapterTo.close();
+        if (mAddressAdapterTo != null && mAddressAdapterTo instanceof EmailAddressAdapter) {
+            ((EmailAddressAdapter) mAddressAdapterTo).close();
         }
-        if (mAddressAdapterCc != null) {
-            mAddressAdapterCc.close();
+        if (mAddressAdapterCc != null && mAddressAdapterCc instanceof EmailAddressAdapter) {
+            ((EmailAddressAdapter) mAddressAdapterCc).close();
         }
-        if (mAddressAdapterBcc != null) {
-            mAddressAdapterBcc.close();
+        if (mAddressAdapterBcc != null && mAddressAdapterBcc instanceof EmailAddressAdapter) {
+            ((EmailAddressAdapter) mAddressAdapterBcc).close();
         }
     }
 
@@ -573,8 +581,12 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
 
     private void initViews() {
         mToView = UiUtilities.getView(this, R.id.to);
+        mToView.setHint(R.string.message_compose_to_hint);
         mCcView = UiUtilities.getView(this, R.id.cc);
+        mCcView.setHint(R.string.message_compose_cc_hint);
         mBccView = UiUtilities.getView(this, R.id.bcc);
+        mBccView.setHint(R.string.message_compose_bcc_hint);
+
         mCcBccContainer = UiUtilities.getView(this, R.id.cc_bcc_container);
         mSubjectView = UiUtilities.getView(this, R.id.subject);
         mMessageContentView = UiUtilities.getView(this, R.id.message_content);
@@ -603,15 +615,12 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
         EmailAddressValidator addressValidator = new EmailAddressValidator();
 
         setupAddressAdapters();
-        mToView.setAdapter(mAddressAdapterTo);
         mToView.setTokenizer(new Rfc822Tokenizer());
         mToView.setValidator(addressValidator);
 
-        mCcView.setAdapter(mAddressAdapterCc);
         mCcView.setTokenizer(new Rfc822Tokenizer());
         mCcView.setValidator(addressValidator);
 
-        mBccView.setAdapter(mAddressAdapterBcc);
         mBccView.setTokenizer(new Rfc822Tokenizer());
         mBccView.setValidator(addressValidator);
 
@@ -660,9 +669,29 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
      * Set up address auto-completion adapters.
      */
     private void setupAddressAdapters() {
-        mAddressAdapterTo = new EmailAddressAdapter(this);
-        mAddressAdapterCc = new EmailAddressAdapter(this);
-        mAddressAdapterBcc = new EmailAddressAdapter(this);
+        boolean supportsChips = ChipsUtil.supportsChipsUi();
+
+        if (supportsChips && mToView instanceof RecipientEditTextView) {
+            mAddressAdapterTo = new RecipientAdapter(this, (RecipientEditTextView) mToView);
+            mToView.setAdapter((RecipientAdapter) mAddressAdapterTo);
+        } else {
+            mAddressAdapterTo = new EmailAddressAdapter(this);
+            mToView.setAdapter((EmailAddressAdapter) mAddressAdapterTo);
+        }
+        if (supportsChips && mCcView instanceof RecipientEditTextView) {
+            mAddressAdapterCc = new RecipientAdapter(this, (RecipientEditTextView) mCcView);
+            mCcView.setAdapter((RecipientAdapter) mAddressAdapterCc);
+        } else {
+            mAddressAdapterCc = new EmailAddressAdapter(this);
+            mCcView.setAdapter((EmailAddressAdapter) mAddressAdapterCc);
+        }
+        if (supportsChips && mBccView instanceof RecipientEditTextView) {
+            mAddressAdapterBcc = new RecipientAdapter(this, (RecipientEditTextView) mBccView);
+            mBccView.setAdapter((RecipientAdapter) mAddressAdapterBcc);
+        } else {
+            mAddressAdapterBcc = new EmailAddressAdapter(this);
+            mBccView.setAdapter((EmailAddressAdapter) mAddressAdapterBcc);
+        }
     }
 
     /**