commit be7b0ac43ad46dd7525f4e1b50aebde035bbd1c6
author Android (Google) Code Review <android-gerrit@google.com> Thu Oct 01 09:38:19 2009 -0400
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 01 09:38:19 2009 -0400
tree 74be2f0a6ff39a95a343fe758358ee7fee80b778
parent 6e9faeff151307482ff5696eaea391ea4e75685e
parent 088a7d0d8c4d0652a42b8bbeb940421cea5ad8dc

Merge change I30c38243 into eclair

* changes:
  b/1972231 A tweak to improve on going to a specific time in the agenda view e.g. from weekview or widget.

src/com/android/calendar/EditEvent.java

diff --git a/src/com/android/calendar/EditEvent.java b/src/com/android/calendar/EditEvent.java
index d70f5ca..6beb301 100644
--- a/src/com/android/calendar/EditEvent.java
+++ b/src/com/android/calendar/EditEvent.java
@@ -1433,6 +1433,8 @@
         // For recurring events, we must make sure that we use duration rather
         // than dtend.
         if (uri == null) {
+            // Add hasAttendeeData for a new event
+            values.put(Events.HAS_ATTENDEE_DATA, 1);
             // Create new event with new contents
             addRecurrenceRule(values);
             eventIdIndex = ops.size();

src/com/android/calendar/EmailAddressAdapter.java

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

src/com/android/calendar/EventInfoActivity.java

diff --git a/src/com/android/calendar/EventInfoActivity.java b/src/com/android/calendar/EventInfoActivity.java
index 2fbfc32..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;
@@ -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);

src/com/android/calendar/MonthActivity.java

diff --git a/src/com/android/calendar/MonthActivity.java b/src/com/android/calendar/MonthActivity.java
index 7bb80c4..62f8602 100644
--- a/src/com/android/calendar/MonthActivity.java
+++ b/src/com/android/calendar/MonthActivity.java
@@ -122,6 +122,9 @@
     public void goToToday() {
         Time now = new Time();
         now.set(System.currentTimeMillis());
+        now.minute = 0;
+        now.second = 0;
+        now.normalize(false);
 
         TextView title = (TextView) findViewById(R.id.title);
         title.setText(Utils.formatMonthYear(now));