commit adccfe6f9277e355f24c8c6181ccea2f6531456a
author Evan Millar <emillar@google.com> Thu Oct 01 11:59:11 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 01 11:59:11 2009 -0700
tree 5bc37412989bf120ed7a20ffdbb2929da2f5d6c5
parent 256ddaa8a55c55e27334b844702ed0ec1885ddc7
parent 51b158459a0535a52b32494555c6f2b420ac0980

am 51b15845: am 08816769: Change FasttrackBadgeWidget->QuickContactBadge

Merge commit '51b158459a0535a52b32494555c6f2b420ac0980'

* commit '51b158459a0535a52b32494555c6f2b420ac0980':
  Change FasttrackBadgeWidget->QuickContactBadge

res/layout/contact_item.xml

diff --git a/res/layout/contact_item.xml b/res/layout/contact_item.xml
index b1b55b0..86ba140 100644
--- a/res/layout/contact_item.xml
+++ b/res/layout/contact_item.xml
@@ -21,7 +21,7 @@
     android:paddingRight="9dip"
     android:minHeight="48dip">
 
-    <FasttrackBadgeWidget
+    <QuickContactBadge
         android:id="@+id/badge"
         android:paddingLeft="3dip"
         android:paddingRight="3dip"
@@ -35,7 +35,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:src="@drawable/ic_contact_picture"
-        style="@*android:style/Widget.FasttrackBadgeWidgetSmall.WindowSmall" />
+        style="@*android:style/Widget.QuickContactBadgeSmall.WindowSmall" />
 
     <TextView
         android:id="@+id/name"

src/com/android/calendar/EventInfoActivity.java

diff --git a/src/com/android/calendar/EventInfoActivity.java b/src/com/android/calendar/EventInfoActivity.java
index 02f6997..2fbfc32 100644
--- a/src/com/android/calendar/EventInfoActivity.java
+++ b/src/com/android/calendar/EventInfoActivity.java
@@ -70,7 +70,7 @@
 import android.view.View.OnTouchListener;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.FasttrackBadgeWidget;
+import android.widget.QuickContactBadge;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -234,7 +234,7 @@
     // TODO This can be removed when the contacts content provider doesn't return duplicates
     private int mUpdateCounts;
     private static class ViewHolder {
-        FasttrackBadgeWidget badge;
+        QuickContactBadge badge;
         ImageView presence;
         int updateCounts;
     }
@@ -934,7 +934,7 @@
             tv.setText(name);
 
             ViewHolder vh = new ViewHolder();
-            vh.badge = (FasttrackBadgeWidget) v.findViewById(R.id.badge);
+            vh.badge = (QuickContactBadge) v.findViewById(R.id.badge);
             vh.badge.assignContactFromEmail(attendee.mEmail, true);
             vh.presence = (ImageView) v.findViewById(R.id.presence);
             mViewHolders.put(attendee.mEmail, vh);