From d5109cf7f08a76efca11e81dfb5f08fcf54c4233 Mon Sep 17 00:00:00 2001
From: Mindy Pereira <mindyp@google.com>
Date: Thu, 15 Dec 2011 14:01:22 -0800
Subject: [PATCH] Use static library resources from chips.

Change-Id: I4261004dda1bd106d0c0ad0aec8348920ffd8c7e
---
 Android.mk                                  |  1 +
 src/com/android/email/RecipientAdapter.java | 30 ---------------------
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/Android.mk b/Android.mk
index ce837b141..7f0a29940 100644
--- a/Android.mk
+++ b/Android.mk
@@ -29,6 +29,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src/com/android/email)
 LOCAL_SRC_FILES += $(call all-java-files-under, src/com/beetstra)
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
 LOCAL_AAPT_FLAGS := --auto-add-overlay
+LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon guava android-common-chips
 
diff --git a/src/com/android/email/RecipientAdapter.java b/src/com/android/email/RecipientAdapter.java
index 03a58ee1a..bfa2cbe92 100644
--- a/src/com/android/email/RecipientAdapter.java
+++ b/src/com/android/email/RecipientAdapter.java
@@ -21,25 +21,10 @@ 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.layout.more_item,
-                R.layout.chips_alternate_item,
-                        r.getDimension(R.dimen.chip_height),
-                        r.getDimension(R.dimen.chip_padding),
-                        r.getDimension(R.dimen.chip_text_size),
-                        R.layout.copy_chip_dialog_layout);
     }
 
     /**
@@ -53,19 +38,4 @@ public class RecipientAdapter extends BaseRecipientAdapter {
             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 getWaitingForDirectorySearchLayout() {
-        return R.layout.chips_waiting_for_directory_search;
-    }
 }