Revert "Revert "Use the resources in the static chips lib now.""

This reverts commit 0d956d2bc94967a0d2c2ae5fdc1662612f5f5dcf

3 files changed, 2 insertions, 29 deletions

diff --git a/Android.mk b/Android.mk
index 7d3d6e59..46ccff06 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,6 +30,8 @@ LOCAL_PACKAGE_NAME := Calendar
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
+LOCAL_AAPT_FLAGS := --auto-add-overlay
+LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips
 
 include $(BUILD_PACKAGE)
 
diff --git a/src/com/android/calendar/RecipientAdapter.java b/src/com/android/calendar/RecipientAdapter.java
index 3f16dd95..bbff0486 100644
--- a/src/com/android/calendar/RecipientAdapter.java
+++ b/src/com/android/calendar/RecipientAdapter.java
@@ -37,19 +37,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;
-    }
 }
diff --git a/src/com/android/calendar/event/EditEventView.java b/src/com/android/calendar/event/EditEventView.java
index 71c992c0..ac0acde0 100644
--- a/src/com/android/calendar/event/EditEventView.java
+++ b/src/com/android/calendar/event/EditEventView.java
@@ -1463,20 +1463,6 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa
             mAddressAdapter = new RecipientAdapter(mActivity);
             list.setAdapter((BaseRecipientAdapter) mAddressAdapter);
             list.setOnFocusListShrinkRecipients(false);
-            Resources r = mActivity.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);
         } else {
             mAddressAdapter = new EmailAddressAdapter(mActivity);
             list.setAdapter((EmailAddressAdapter)mAddressAdapter);