Merge change I710d4ade into eclair
* changes:
Add hasAttendeeData for new events.
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/AlertService.java b/src/com/android/calendar/AlertService.java
index 6550694..3719f6b 100644
--- a/src/com/android/calendar/AlertService.java
+++ b/src/com/android/calendar/AlertService.java
@@ -113,6 +113,11 @@
}
if (alertUri != null) {
+ if (!Calendar.AUTHORITY.equals(alertUri.getAuthority())) {
+ Log.w(TAG, "Invalid AUTHORITY uri: " + alertUri);
+ return;
+ }
+
// Record the received time in the CalendarAlerts table.
// This is useful for finding bugs that cause alarms to be
// missed or delayed.
diff --git a/src/com/android/calendar/EmailAddressAdapter.java b/src/com/android/calendar/EmailAddressAdapter.java
index 4679960..bfcb986 100644
--- a/src/com/android/calendar/EmailAddressAdapter.java
+++ b/src/com/android/calendar/EmailAddressAdapter.java
@@ -59,7 +59,7 @@
String name = cursor.getString(NAME_INDEX);
String address = cursor.getString(DATA_INDEX);
- return new Rfc822Token(address, name, null).toString();
+ return new Rfc822Token(name, address, null).toString();
}
@Override
diff --git a/src/com/android/calendar/EventInfoActivity.java b/src/com/android/calendar/EventInfoActivity.java
index 02f6997..ee047b3 100644
--- a/src/com/android/calendar/EventInfoActivity.java
+++ b/src/com/android/calendar/EventInfoActivity.java
@@ -50,7 +50,7 @@
import android.provider.ContactsContract.CommonDataKinds;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Data;
-import android.provider.ContactsContract.FastTrack;
+import android.provider.ContactsContract.QuickContact;
import android.provider.ContactsContract.Intents;
import android.provider.ContactsContract.Presence;
import android.provider.ContactsContract.CommonDataKinds.Email;
@@ -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);
@@ -1084,8 +1084,8 @@
final Uri lookupUri = ContactsContract.Data.getContactLookupUri(resolver, dataUri);
if (lookupUri != null) {
- // Found matching contact, trigger FastTrack
- FastTrack.showFastTrack(this, rect, lookupUri, FastTrack.MODE_MEDIUM, null);
+ // Found matching contact, trigger QuickContact
+ QuickContact.showQuickContact(this, rect, lookupUri, QuickContact.MODE_MEDIUM, null);
} else {
// No matching contact, ask user to create one
final Uri mailUri = Uri.fromParts("mailto", address, null);
