Merge change I161a5026 into eclair
* changes:
b/2157070 Fixed the Calendar event reminder alert.
diff --git a/res/drawable-hdpi/app_icon.png b/res/drawable-hdpi/app_icon.png
index 8ada412..d4cafaa 100644
--- a/res/drawable-hdpi/app_icon.png
+++ b/res/drawable-hdpi/app_icon.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_contact_picture.png b/res/drawable-hdpi/ic_contact_picture.png
new file mode 100755
index 0000000..7c34f5c
--- /dev/null
+++ b/res/drawable-hdpi/ic_contact_picture.png
Binary files differ
diff --git a/res/drawable-hdpi/im_avatar_picture_border_normal.9.png b/res/drawable-hdpi/im_avatar_picture_border_normal.9.png
new file mode 100755
index 0000000..2367f98
--- /dev/null
+++ b/res/drawable-hdpi/im_avatar_picture_border_normal.9.png
Binary files differ
diff --git a/res/drawable/ic_contact_picture.png b/res/drawable-mdpi/ic_contact_picture.png
similarity index 100%
rename from res/drawable/ic_contact_picture.png
rename to res/drawable-mdpi/ic_contact_picture.png
Binary files differ
diff --git a/res/drawable/im_avatar_picture_border_normal.9.png b/res/drawable-mdpi/im_avatar_picture_border_normal.9.png
similarity index 100%
rename from res/drawable/im_avatar_picture_border_normal.9.png
rename to res/drawable-mdpi/im_avatar_picture_border_normal.9.png
Binary files differ
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"
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);
