Rename Calendar.java to CalendarContract.java

Change-Id: Ia6692454099322f6891b326b2c1ad919c13026b7

32 files changed, 111 insertions, 111 deletions

diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java
index ecb2c9ee..82f52b80 100644
--- a/src/com/android/calendar/AllInOneActivity.java
+++ b/src/com/android/calendar/AllInOneActivity.java
@@ -16,9 +16,9 @@
 
 package com.android.calendar;
 
-import static android.provider.Calendar.EVENT_BEGIN_TIME;
-import static android.provider.Calendar.EVENT_END_TIME;
-import static android.provider.Calendar.Attendees.ATTENDEE_STATUS;
+import static android.provider.CalendarContract.EVENT_BEGIN_TIME;
+import static android.provider.CalendarContract.EVENT_END_TIME;
+import static android.provider.CalendarContract.Attendees.ATTENDEE_STATUS;
 import static com.android.calendar.CalendarController.EVENT_ATTENDEE_RESPONSE;
 
 import com.android.calendar.CalendarController.EventHandler;
@@ -50,8 +50,8 @@ import android.database.ContentObserver;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.provider.Calendar;
-import android.provider.Calendar.Events;
+import android.provider.CalendarContract;
+import android.provider.CalendarContract.Events;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
@@ -345,7 +345,7 @@ public class AllInOneActivity extends Activity implements EventHandler,
     @Override
     protected void onResume() {
         super.onResume();
-        mContentResolver.registerContentObserver(Calendar.Events.CONTENT_URI, true, mObserver);
+        mContentResolver.registerContentObserver(CalendarContract.Events.CONTENT_URI, true, mObserver);
         if (mUpdateOnResume) {
             initFragments(mController.getTime(), mController.getViewType(), null);
             mUpdateOnResume = false;
diff --git a/src/com/android/calendar/CalendarController.java b/src/com/android/calendar/CalendarController.java
index fda95e7b..1dfc8f7a 100644
--- a/src/com/android/calendar/CalendarController.java
+++ b/src/com/android/calendar/CalendarController.java
@@ -16,8 +16,8 @@
 
 package com.android.calendar;
 
-import static android.provider.Calendar.EVENT_BEGIN_TIME;
-import static android.provider.Calendar.EVENT_END_TIME;
+import static android.provider.CalendarContract.EVENT_BEGIN_TIME;
+import static android.provider.CalendarContract.EVENT_END_TIME;
 
 import com.android.calendar.event.EditEventActivity;
 
@@ -34,8 +34,8 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.provider.Calendar.Calendars;
-import android.provider.Calendar.Events;
+import android.provider.CalendarContract.Calendars;
+import android.provider.CalendarContract.Events;
 import android.text.TextUtils;
 import android.text.format.Time;
 import android.util.Log;
diff --git a/src/com/android/calendar/CalendarEventModel.java b/src/com/android/calendar/CalendarEventModel.java
index 464f70ef..639d6bf4 100644
--- a/src/com/android/calendar/CalendarEventModel.java
+++ b/src/com/android/calendar/CalendarEventModel.java
@@ -19,10 +19,10 @@ package com.android.calendar;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.provider.Calendar.Attendees;
-import android.provider.Calendar.Calendars;
-import android.provider.Calendar.Events;
-import android.provider.Calendar.Reminders;
+import android.provider.CalendarContract.Attendees;
+import android.provider.CalendarContract.Calendars;
+import android.provider.CalendarContract.Events;
+import android.provider.CalendarContract.Reminders;
 import android.text.TextUtils;
 
 import java.io.Serializable;
diff --git a/src/com/android/calendar/CalendarSettingsActivity.java b/src/com/android/calendar/CalendarSettingsActivity.java
index 890c687b..d4147214 100644
--- a/src/com/android/calendar/CalendarSettingsActivity.java
+++ b/src/com/android/calendar/CalendarSettingsActivity.java
@@ -25,8 +25,8 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceActivity;
-import android.provider.Calendar;
-import android.provider.Calendar.Calendars;
+import android.provider.CalendarContract;
+import android.provider.CalendarContract.Calendars;
 import android.provider.Settings;
 import android.text.format.DateUtils;
 import android.view.Menu;
@@ -60,7 +60,7 @@ public class CalendarSettingsActivity extends PreferenceActivity {
             int length = accounts.length;
             for (int i = 0; i < length; i++) {
                 Account acct = accounts[i];
-                if (ContentResolver.getIsSyncable(acct, Calendar.AUTHORITY) > 0) {
+                if (ContentResolver.getIsSyncable(acct, CalendarContract.AUTHORITY) > 0) {
                     Header accountHeader = new Header();
                     accountHeader.title = acct.name;
                     accountHeader.fragment =
diff --git a/src/com/android/calendar/CalendarUtils.java b/src/com/android/calendar/CalendarUtils.java
index 1428723d..886e92e7 100644
--- a/src/com/android/calendar/CalendarUtils.java
+++ b/src/com/android/calendar/CalendarUtils.java
@@ -22,7 +22,7 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.Cursor;
-import android.provider.Calendar.CalendarCache;
+import android.provider.CalendarContract.CalendarCache;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.text.format.Time;
diff --git a/src/com/android/calendar/DayView.java b/src/com/android/calendar/DayView.java
index 567db1bf..4d42bb9c 100644
--- a/src/com/android/calendar/DayView.java
+++ b/src/com/android/calendar/DayView.java
@@ -38,9 +38,9 @@ import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Handler;
-import android.provider.Calendar.Attendees;
-import android.provider.Calendar.Calendars;
-import android.provider.Calendar.Events;
+import android.provider.CalendarContract.Attendees;
+import android.provider.CalendarContract.Calendars;
+import android.provider.CalendarContract.Events;
 import android.text.Layout.Alignment;
 import android.text.StaticLayout;
 import android.text.TextPaint;
diff --git a/src/com/android/calendar/DeleteEventHelper.java b/src/com/android/calendar/DeleteEventHelper.java
index c46a824d..44b5ed56 100644
--- a/src/com/android/calendar/DeleteEventHelper.java
+++ b/src/com/android/calendar/DeleteEventHelper.java
@@ -27,8 +27,8 @@ import android.content.DialogInterface;
 import android.database.Cursor;
 import android.net.Uri;
 import android.pim.EventRecurrence;
-import android.provider.Calendar;
-import android.provider.Calendar.Events;
+import android.provider.CalendarContract;
+import android.provider.CalendarContract.Events;
 import android.text.TextUtils;
 import android.text.format.Time;
 import android.widget.Button;
@@ -123,7 +123,7 @@ public class DeleteEventHelper {
             new DialogInterface.OnClickListener() {
         public void onClick(DialogInterface dialog, int button) {
             long id = mModel.mId; // mCursor.getInt(mEventIndexId);
-            Uri uri = ContentUris.withAppendedId(Calendar.Events.CONTENT_URI, id);
+            Uri uri = ContentUris.withAppendedId(CalendarContract.Events.CONTENT_URI, id);
             mService.startDelete(mService.getNextToken(), null, uri, null, null, Utils.UNDO_DELAY);
             if (mCallback != null) {
                 mCallback.run();
@@ -192,7 +192,7 @@ public class DeleteEventHelper {
      *  {@link DELETE_ALL_FOLLOWING}, {@link DELETE_ALL}, or -1
      */
     public void delete(long begin, long end, long eventId, int which) {
-        Uri uri = ContentUris.withAppendedId(Calendar.Events.CONTENT_URI, eventId);
+        Uri uri = ContentUris.withAppendedId(CalendarContract.Events.CONTENT_URI, eventId);
         mService.startQuery(mService.getNextToken(), null, uri, EditEventHelper.EVENT_PROJECTION,
                 null, null, null);
         mStartMillis = begin;
@@ -303,7 +303,7 @@ public class DeleteEventHelper {
         ContentValues values = new ContentValues();
         values.put(Events.STATUS, Events.STATUS_CANCELED);
 
-        Uri uri = ContentUris.withAppendedId(Calendar.Events.CONTENT_URI, id);
+        Uri uri = ContentUris.withAppendedId(CalendarContract.Events.CONTENT_URI, id);
         mService.startUpdate(mService.getNextToken(), null, uri, values, null, null,
                 Utils.UNDO_DELAY);
     }
@@ -360,7 +360,7 @@ public class DeleteEventHelper {
                 break;
             }
             case DELETE_ALL: {
-                Uri uri = ContentUris.withAppendedId(Calendar.Events.CONTENT_URI, id);
+                Uri uri = ContentUris.withAppendedId(CalendarContract.Events.CONTENT_URI, id);
                 mService.startDelete(mService.getNextToken(), null, uri, null, null,
                         Utils.UNDO_DELAY);
                 break;
@@ -369,7 +369,7 @@ public class DeleteEventHelper {
                 // If we are deleting the first event in the series and all
                 // following events, then delete them all.
                 if (dtstart == mStartMillis) {
-                    Uri uri = ContentUris.withAppendedId(Calendar.Events.CONTENT_URI, id);
+                    Uri uri = ContentUris.withAppendedId(CalendarContract.Events.CONTENT_URI, id);
                     mService.startDelete(mService.getNextToken(), null, uri, null, null,
                             Utils.UNDO_DELAY);
                     break;
@@ -394,7 +394,7 @@ public class DeleteEventHelper {
                 ContentValues values = new ContentValues();
                 values.put(Events.DTSTART, dtstart);
                 values.put(Events.RRULE, eventRecurrence.toString());
-                Uri uri = ContentUris.withAppendedId(Calendar.Events.CONTENT_URI, id);
+                Uri uri = ContentUris.withAppendedId(CalendarContract.Events.CONTENT_URI, id);
                 mService.startUpdate(mService.getNextToken(), null, uri, values, null, null,
                         Utils.UNDO_DELAY);
                 break;
diff --git a/src/com/android/calendar/Event.java b/src/com/android/calendar/Event.java
index a6980429..950b0a35 100644
--- a/src/com/android/calendar/Event.java
+++ b/src/com/android/calendar/Event.java
@@ -21,9 +21,9 @@ import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.os.Debug;
-import android.provider.Calendar.Attendees;
-import android.provider.Calendar.Events;
-import android.provider.Calendar.Instances;
+import android.provider.CalendarContract.Attendees;
+import android.provider.CalendarContract.Events;
+import android.provider.CalendarContract.Instances;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.text.format.Time;
diff --git a/src/com/android/calendar/EventInfoActivity.java b/src/com/android/calendar/EventInfoActivity.java
index a250b97b..4ba67a37 100644
--- a/src/com/android/calendar/EventInfoActivity.java
+++ b/src/com/android/calendar/EventInfoActivity.java
@@ -15,8 +15,8 @@
  */
 package com.android.calendar;
 
-import static android.provider.Calendar.EVENT_BEGIN_TIME;
-import static android.provider.Calendar.EVENT_END_TIME;
+import static android.provider.CalendarContract.EVENT_BEGIN_TIME;
+import static android.provider.CalendarContract.EVENT_END_TIME;
 import static com.android.calendar.CalendarController.ATTENDEE_NO_RESPONSE;
 import static com.android.calendar.CalendarController.EVENT_ATTENDEE_RESPONSE;
 import static com.android.calendar.CalendarController.EVENT_EDIT_ON_LAUNCH;
@@ -31,8 +31,8 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.provider.Calendar;
-import android.provider.Calendar.Events;
+import android.provider.CalendarContract;
+import android.provider.CalendarContract.Events;
 import android.text.format.Time;
 import android.util.Log;
 import android.view.Menu;
@@ -117,7 +117,7 @@ public class EventInfoActivity extends Activity {
             case android.R.id.home:
                 Intent launchIntent = new Intent();
                 launchIntent.setAction(Intent.ACTION_VIEW);
-                launchIntent.setData(Uri.parse(Calendar.CONTENT_URI + "/time"));
+                launchIntent.setData(Uri.parse(CalendarContract.CONTENT_URI + "/time"));
                 launchIntent.setFlags(
                         Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 startActivity(launchIntent);
diff --git a/src/com/android/calendar/EventInfoFragment.java b/src/com/android/calendar/EventInfoFragment.java
index 2a948bb1..53c2b3a6 100644
--- a/src/com/android/calendar/EventInfoFragment.java
+++ b/src/com/android/calendar/EventInfoFragment.java
@@ -40,10 +40,10 @@ import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Bundle;
 import android.pim.EventRecurrence;
-import android.provider.Calendar;
-import android.provider.Calendar.Attendees;
-import android.provider.Calendar.Calendars;
-import android.provider.Calendar.Events;
+import android.provider.CalendarContract;
+import android.provider.CalendarContract.Attendees;
+import android.provider.CalendarContract.Calendars;
+import android.provider.CalendarContract.Events;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds;
 import android.provider.ContactsContract.Intents;
@@ -786,7 +786,7 @@ public class EventInfoFragment extends DialogFragment implements OnCheckedChange
 
         // Create a recurrence exception
         mHandler.startBatch(
-                mHandler.getNextToken(), null, Calendar.AUTHORITY, ops, Utils.UNDO_DELAY);
+                mHandler.getNextToken(), null, CalendarContract.AUTHORITY, ops, Utils.UNDO_DELAY);
     }
 
     /**
diff --git a/src/com/android/calendar/EventLoader.java b/src/com/android/calendar/EventLoader.java
index 42e907c4..9a34fb29 100644
--- a/src/com/android/calendar/EventLoader.java
+++ b/src/com/android/calendar/EventLoader.java
@@ -21,7 +21,7 @@ import android.content.Context;
 import android.database.Cursor;
 import android.os.Handler;
 import android.os.Process;
-import android.provider.Calendar.EventDays;
+import android.provider.CalendarContract.EventDays;
 import android.util.Log;
 
 import java.util.ArrayList;
diff --git a/src/com/android/calendar/GeneralPreferences.java b/src/com/android/calendar/GeneralPreferences.java
index a99eac6a..d25ba2f1 100644
--- a/src/com/android/calendar/GeneralPreferences.java
+++ b/src/com/android/calendar/GeneralPreferences.java
@@ -32,7 +32,7 @@ import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.preference.RingtonePreference;
-import android.provider.Calendar.CalendarCache;
+import android.provider.CalendarContract.CalendarCache;
 import android.provider.SearchRecentSuggestions;
 import android.text.TextUtils;
 import android.widget.Toast;
diff --git a/src/com/android/calendar/GoogleCalendarUriIntentFilter.java b/src/com/android/calendar/GoogleCalendarUriIntentFilter.java
index de7618b3..f3710b37 100644
--- a/src/com/android/calendar/GoogleCalendarUriIntentFilter.java
+++ b/src/com/android/calendar/GoogleCalendarUriIntentFilter.java
@@ -17,13 +17,13 @@
 
 package com.android.calendar;
 
-import static android.provider.Calendar.EVENT_BEGIN_TIME;
-import static android.provider.Calendar.EVENT_END_TIME;
-import static android.provider.Calendar.Attendees.ATTENDEE_STATUS;
-import static android.provider.Calendar.Attendees.ATTENDEE_STATUS_ACCEPTED;
-import static android.provider.Calendar.Attendees.ATTENDEE_STATUS_DECLINED;
-import static android.provider.Calendar.Attendees.ATTENDEE_STATUS_NONE;
-import static android.provider.Calendar.Attendees.ATTENDEE_STATUS_TENTATIVE;
+import static android.provider.CalendarContract.EVENT_BEGIN_TIME;
+import static android.provider.CalendarContract.EVENT_END_TIME;
+import static android.provider.CalendarContract.Attendees.ATTENDEE_STATUS;
+import static android.provider.CalendarContract.Attendees.ATTENDEE_STATUS_ACCEPTED;
+import static android.provider.CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED;
+import static android.provider.CalendarContract.Attendees.ATTENDEE_STATUS_NONE;
+import static android.provider.CalendarContract.Attendees.ATTENDEE_STATUS_TENTATIVE;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
@@ -32,7 +32,7 @@ import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.provider.Calendar.Events;
+import android.provider.CalendarContract.Events;
 import android.util.Base64;
 import android.util.Log;
 
diff --git a/src/com/android/calendar/SearchActivity.java b/src/com/android/calendar/SearchActivity.java
index a24583ed..08b52efe 100644
--- a/src/com/android/calendar/SearchActivity.java
+++ b/src/com/android/calendar/SearchActivity.java
@@ -15,8 +15,8 @@
  */
 package com.android.calendar;
 
-import static android.provider.Calendar.EVENT_BEGIN_TIME;
-import static android.provider.Calendar.EVENT_END_TIME;
+import static android.provider.CalendarContract.EVENT_BEGIN_TIME;
+import static android.provider.CalendarContract.EVENT_END_TIME;
 
 import android.app.ActionBar;
 import android.app.Activity;
@@ -30,7 +30,7 @@ import android.database.ContentObserver;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.provider.Calendar.Events;
+import android.provider.CalendarContract.Events;
 import android.provider.SearchRecentSuggestions;
 import android.text.format.Time;
 import android.util.Log;
diff --git a/src/com/android/calendar/Utils.java b/src/com/android/calendar/Utils.java
index bdb65350..1fd51113 100644
--- a/src/com/android/calendar/Utils.java
+++ b/src/com/android/calendar/Utils.java
@@ -16,7 +16,7 @@
 
 package com.android.calendar;
 
-import static android.provider.Calendar.EVENT_BEGIN_TIME;
+import static android.provider.CalendarContract.EVENT_BEGIN_TIME;
 
 import com.android.calendar.CalendarController.ViewType;
 
diff --git a/src/com/android/calendar/agenda/AgendaAdapter.java b/src/com/android/calendar/agenda/AgendaAdapter.java
index 5a028449..5ad0ab1e 100644
--- a/src/com/android/calendar/agenda/AgendaAdapter.java
+++ b/src/com/android/calendar/agenda/AgendaAdapter.java
@@ -22,7 +22,7 @@ import com.android.calendar.Utils;
 import android.content.Context;
 import android.content.res.Resources;
 import android.database.Cursor;
-import android.provider.Calendar.Attendees;
+import android.provider.CalendarContract.Attendees;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
diff --git a/src/com/android/calendar/agenda/AgendaWindowAdapter.java b/src/com/android/calendar/agenda/AgendaWindowAdapter.java
index 04c58f3b..e05a9a98 100644
--- a/src/com/android/calendar/agenda/AgendaWindowAdapter.java
+++ b/src/com/android/calendar/agenda/AgendaWindowAdapter.java
@@ -29,10 +29,10 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.net.Uri;
-import android.provider.Calendar;
-import android.provider.Calendar.Attendees;
-import android.provider.Calendar.Calendars;
-import android.provider.Calendar.Instances;
+import android.provider.CalendarContract;
+import android.provider.CalendarContract.Attendees;
+import android.provider.CalendarContract.Calendars;
+import android.provider.CalendarContract.Instances;
 import android.text.format.DateUtils;
 import android.text.format.Time;
 import android.util.Log;
@@ -75,9 +75,9 @@ public class AgendaWindowAdapter extends BaseAdapter
     private static final String TAG = "AgendaWindowAdapter";
 
     private static final String AGENDA_SORT_ORDER =
-            Calendar.Instances.START_DAY + " ASC, " +
-            Calendar.Instances.BEGIN + " ASC, " +
-            Calendar.Events.TITLE + " ASC";
+            CalendarContract.Instances.START_DAY + " ASC, " +
+            CalendarContract.Instances.BEGIN + " ASC, " +
+            CalendarContract.Events.TITLE + " ASC";
 
     public static final int INDEX_INSTANCE_ID = 0;
     public static final int INDEX_TITLE = 1;
diff --git a/src/com/android/calendar/alerts/AlertActivity.java b/src/com/android/calendar/alerts/AlertActivity.java
index 4c1269d8..dc0017e2 100644
--- a/src/com/android/calendar/alerts/AlertActivity.java
+++ b/src/com/android/calendar/alerts/AlertActivity.java
@@ -30,8 +30,8 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.net.Uri.Builder;
 import android.os.Bundle;
-import android.provider.Calendar;
-import android.provider.Calendar.CalendarAlerts;
+import android.provider.CalendarContract;
+import android.provider.CalendarContract.CalendarAlerts;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -185,11 +185,11 @@ public class AlertActivity extends Activity implements OnClickListener {
             long startMillis = cursor.getLong(AlertActivity.INDEX_BEGIN);
             long endMillis = cursor.getLong(AlertActivity.INDEX_END);
             Intent eventIntent = new Intent(Intent.ACTION_VIEW);
-            Builder builder = Calendar.CONTENT_URI.buildUpon();
+            Builder builder = CalendarContract.CONTENT_URI.buildUpon();
             builder.appendEncodedPath("events/" + id);
             eventIntent.setData(builder.build());
-            eventIntent.putExtra(Calendar.EVENT_BEGIN_TIME, startMillis);
-            eventIntent.putExtra(Calendar.EVENT_END_TIME, endMillis);
+            eventIntent.putExtra(CalendarContract.EVENT_BEGIN_TIME, startMillis);
+            eventIntent.putExtra(CalendarContract.EVENT_END_TIME, endMillis);
             alertActivity.startActivity(eventIntent);
 
             alertActivity.finish();
diff --git a/src/com/android/calendar/alerts/AlertService.java b/src/com/android/calendar/alerts/AlertService.java
index 37afe701..b6caa0c4 100644
--- a/src/com/android/calendar/alerts/AlertService.java
+++ b/src/com/android/calendar/alerts/AlertService.java
@@ -39,8 +39,8 @@ import android.os.IBinder;
 import android.os.Looper;
 import android.os.Message;
 import android.os.Process;
-import android.provider.Calendar.Attendees;
-import android.provider.Calendar.CalendarAlerts;
+import android.provider.CalendarContract.Attendees;
+import android.provider.CalendarContract.CalendarAlerts;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -98,7 +98,7 @@ public class AlertService extends Service {
         // CalendarAlerts table.
         String action = bundle.getString("action");
         if (DEBUG) {
-            Log.d(TAG, "" + bundle.getLong(android.provider.Calendar.CalendarAlerts.ALARM_TIME)
+            Log.d(TAG, "" + bundle.getLong(android.provider.CalendarContract.CalendarAlerts.ALARM_TIME)
                     + " Action = " + action);
         }
 
@@ -108,7 +108,7 @@ public class AlertService extends Service {
             return;
         }
 
-        if (!action.equals(android.provider.Calendar.EVENT_REMINDER_ACTION)
+        if (!action.equals(android.provider.CalendarContract.EVENT_REMINDER_ACTION)
                 && !action.equals(Intent.ACTION_LOCALE_CHANGED)) {
             Log.w(TAG, "Invalid action: " + action);
             return;
diff --git a/src/com/android/calendar/alerts/DismissAllAlarmsService.java b/src/com/android/calendar/alerts/DismissAllAlarmsService.java
index f04989fb..8d81d081 100644
--- a/src/com/android/calendar/alerts/DismissAllAlarmsService.java
+++ b/src/com/android/calendar/alerts/DismissAllAlarmsService.java
@@ -22,7 +22,7 @@ import android.content.ContentValues;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.IBinder;
-import android.provider.Calendar.CalendarAlerts;
+import android.provider.CalendarContract.CalendarAlerts;
 
 /**
  * Service for asynchronously marking all fired alarms as dismissed.
diff --git a/src/com/android/calendar/event/AttendeesView.java b/src/com/android/calendar/event/AttendeesView.java
index b7fa3261..ac24f47f 100644
--- a/src/com/android/calendar/event/AttendeesView.java
+++ b/src/com/android/calendar/event/AttendeesView.java
@@ -34,7 +34,7 @@ import android.graphics.ColorMatrixColorFilter;
 import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.provider.Calendar.Attendees;
+import android.provider.CalendarContract.Attendees;
 import android.provider.ContactsContract.CommonDataKinds.Email;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Data;
diff --git a/src/com/android/calendar/event/EditEventActivity.java b/src/com/android/calendar/event/EditEventActivity.java
index 470a20e3..99b65812 100644
--- a/src/com/android/calendar/event/EditEventActivity.java
+++ b/src/com/android/calendar/event/EditEventActivity.java
@@ -16,15 +16,15 @@
 
 package com.android.calendar.event;
 
-import static android.provider.Calendar.EVENT_BEGIN_TIME;
-import static android.provider.Calendar.EVENT_END_TIME;
+import static android.provider.CalendarContract.EVENT_BEGIN_TIME;
+import static android.provider.CalendarContract.EVENT_END_TIME;
 
 import android.app.ActionBar;
 import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.provider.Calendar;
+import android.provider.CalendarContract;
 import android.text.format.Time;
 import android.util.Log;
 import android.view.MenuItem;
@@ -124,7 +124,7 @@ public class EditEventActivity extends AbstractCalendarActivity {
         if (item.getItemId() == android.R.id.home) {
             Intent launchIntent = new Intent();
             launchIntent.setAction(Intent.ACTION_VIEW);
-            launchIntent.setData(Uri.parse(Calendar.CONTENT_URI + "/time"));
+            launchIntent.setData(Uri.parse(CalendarContract.CONTENT_URI + "/time"));
             launchIntent.setFlags(
                     Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED | Intent.FLAG_ACTIVITY_CLEAR_TOP);
             startActivity(launchIntent);
diff --git a/src/com/android/calendar/event/EditEventFragment.java b/src/com/android/calendar/event/EditEventFragment.java
index 3ac95deb..10c9b683 100644
--- a/src/com/android/calendar/event/EditEventFragment.java
+++ b/src/com/android/calendar/event/EditEventFragment.java
@@ -32,10 +32,10 @@ import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.provider.Calendar.Attendees;
-import android.provider.Calendar.Calendars;
-import android.provider.Calendar.Events;
-import android.provider.Calendar.Reminders;
+import android.provider.CalendarContract.Attendees;
+import android.provider.CalendarContract.Calendars;
+import android.provider.CalendarContract.Events;
+import android.provider.CalendarContract.Reminders;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
diff --git a/src/com/android/calendar/event/EditEventHelper.java b/src/com/android/calendar/event/EditEventHelper.java
index 11d1be23..31f9fc8c 100644
--- a/src/com/android/calendar/event/EditEventHelper.java
+++ b/src/com/android/calendar/event/EditEventHelper.java
@@ -33,10 +33,10 @@ import android.database.Cursor;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.pim.EventRecurrence;
-import android.provider.Calendar.Attendees;
-import android.provider.Calendar.Calendars;
-import android.provider.Calendar.Events;
-import android.provider.Calendar.Reminders;
+import android.provider.CalendarContract.Attendees;
+import android.provider.CalendarContract.Calendars;
+import android.provider.CalendarContract.Events;
+import android.provider.CalendarContract.Reminders;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.text.format.Time;
@@ -541,7 +541,7 @@ public class EditEventHelper {
         }
 
 
-        mService.startBatch(mService.getNextToken(), null, android.provider.Calendar.AUTHORITY, ops,
+        mService.startBatch(mService.getNextToken(), null, android.provider.CalendarContract.AUTHORITY, ops,
                 Utils.UNDO_DELAY);
 
         return true;
diff --git a/src/com/android/calendar/event/EditEventView.java b/src/com/android/calendar/event/EditEventView.java
index b2e302a7..a33ff236 100644
--- a/src/com/android/calendar/event/EditEventView.java
+++ b/src/com/android/calendar/event/EditEventView.java
@@ -46,9 +46,9 @@ import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.drawable.Drawable;
 import android.pim.EventRecurrence;
-import android.provider.Calendar.Attendees;
-import android.provider.Calendar.Calendars;
-import android.provider.Calendar.Reminders;
+import android.provider.CalendarContract.Attendees;
+import android.provider.CalendarContract.Calendars;
+import android.provider.CalendarContract.Reminders;
 import android.provider.Settings;
 import android.text.Editable;
 import android.text.InputFilter;
diff --git a/src/com/android/calendar/month/MonthByWeekFragment.java b/src/com/android/calendar/month/MonthByWeekFragment.java
index e1b7e3be..b68c06ea 100644
--- a/src/com/android/calendar/month/MonthByWeekFragment.java
+++ b/src/com/android/calendar/month/MonthByWeekFragment.java
@@ -32,9 +32,9 @@ import android.content.Loader;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.provider.Calendar.Attendees;
-import android.provider.Calendar.Calendars;
-import android.provider.Calendar.Instances;
+import android.provider.CalendarContract.Attendees;
+import android.provider.CalendarContract.Calendars;
+import android.provider.CalendarContract.Instances;
 import android.text.format.DateUtils;
 import android.text.format.Time;
 import android.util.Log;
diff --git a/src/com/android/calendar/selectcalendars/SelectCalendarsFragment.java b/src/com/android/calendar/selectcalendars/SelectCalendarsFragment.java
index e917fe90..6aaf35a3 100644
--- a/src/com/android/calendar/selectcalendars/SelectCalendarsFragment.java
+++ b/src/com/android/calendar/selectcalendars/SelectCalendarsFragment.java
@@ -29,7 +29,7 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.provider.Calendar.Calendars;
+import android.provider.CalendarContract.Calendars;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/src/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java b/src/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java
index 78e6ef58..1fa46b2d 100644
--- a/src/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java
+++ b/src/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java
@@ -23,7 +23,7 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.drawable.Drawable;
-import android.provider.Calendar.Calendars;
+import android.provider.CalendarContract.Calendars;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/src/com/android/calendar/selectcalendars/SelectCalendarsSyncAdapter.java b/src/com/android/calendar/selectcalendars/SelectCalendarsSyncAdapter.java
index eada67e7..073b7c5d 100644
--- a/src/com/android/calendar/selectcalendars/SelectCalendarsSyncAdapter.java
+++ b/src/com/android/calendar/selectcalendars/SelectCalendarsSyncAdapter.java
@@ -22,7 +22,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.drawable.shapes.RectShape;
-import android.provider.Calendar.Calendars;
+import android.provider.CalendarContract.Calendars;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/src/com/android/calendar/selectcalendars/SelectCalendarsSyncFragment.java b/src/com/android/calendar/selectcalendars/SelectCalendarsSyncFragment.java
index 5ad64819..94c42742 100644
--- a/src/com/android/calendar/selectcalendars/SelectCalendarsSyncFragment.java
+++ b/src/com/android/calendar/selectcalendars/SelectCalendarsSyncFragment.java
@@ -34,8 +34,8 @@ import android.content.res.Resources;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.provider.Calendar;
-import android.provider.Calendar.Calendars;
+import android.provider.CalendarContract;
+import android.provider.CalendarContract.Calendars;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -116,7 +116,7 @@ public class SelectCalendarsSyncFragment extends ListFragment
     public void onResume() {
         super.onResume();
         if (!ContentResolver.getMasterSyncAutomatically()
-                || !ContentResolver.getSyncAutomatically(mAccount, Calendar.AUTHORITY)) {
+                || !ContentResolver.getSyncAutomatically(mAccount, CalendarContract.AUTHORITY)) {
             Resources res = getActivity().getResources();
             mSyncStatus.setText(res.getString(R.string.acct_not_synced));
             mSyncStatus.setVisibility(View.VISIBLE);
diff --git a/src/com/android/calendar/widget/CalendarAppWidgetProvider.java b/src/com/android/calendar/widget/CalendarAppWidgetProvider.java
index e7249f16..d8c3c21d 100644
--- a/src/com/android/calendar/widget/CalendarAppWidgetProvider.java
+++ b/src/com/android/calendar/widget/CalendarAppWidgetProvider.java
@@ -16,8 +16,8 @@
 
 package com.android.calendar.widget;
 
-import static android.provider.Calendar.EVENT_BEGIN_TIME;
-import static android.provider.Calendar.EVENT_END_TIME;
+import static android.provider.CalendarContract.EVENT_BEGIN_TIME;
+import static android.provider.CalendarContract.EVENT_END_TIME;
 
 import com.android.calendar.R;
 import com.android.calendar.Utils;
@@ -31,7 +31,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.net.Uri.Builder;
-import android.provider.Calendar;
+import android.provider.CalendarContract;
 import android.text.format.DateUtils;
 import android.text.format.Time;
 import android.util.Log;
@@ -176,7 +176,7 @@ public class CalendarAppWidgetProvider extends AppWidgetProvider {
      */
     static PendingIntent getUpdateIntent(Context context) {
         Intent intent = new Intent(ACTION_CALENDAR_APPWIDGET_SCHEDULED_UPDATE);
-        intent.setDataAndType(Calendar.CONTENT_URI, APPWIDGET_DATA_TYPE);
+        intent.setDataAndType(CalendarContract.CONTENT_URI, APPWIDGET_DATA_TYPE);
         return PendingIntent.getBroadcast(context, 0 /* no requestCode */, intent,
                 0 /* no flags */);
     }
@@ -221,7 +221,7 @@ public class CalendarAppWidgetProvider extends AppWidgetProvider {
 
     private static PendingIntent getNewEventPendingIntent(Context context) {
         Intent newEventIntent = new Intent(Intent.ACTION_EDIT);
-        Builder builder = Calendar.CONTENT_URI.buildUpon();
+        Builder builder = CalendarContract.CONTENT_URI.buildUpon();
         builder.appendPath("events");
         newEventIntent.setData(builder.build());
         return PendingIntent.getActivity(context, 0, newEventIntent,
diff --git a/src/com/android/calendar/widget/CalendarAppWidgetService.java b/src/com/android/calendar/widget/CalendarAppWidgetService.java
index 79eb0998..9222e944 100644
--- a/src/com/android/calendar/widget/CalendarAppWidgetService.java
+++ b/src/com/android/calendar/widget/CalendarAppWidgetService.java
@@ -38,10 +38,10 @@ import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.net.Uri;
 import android.os.Handler;
-import android.provider.Calendar;
-import android.provider.Calendar.Attendees;
-import android.provider.Calendar.Calendars;
-import android.provider.Calendar.Instances;
+import android.provider.CalendarContract;
+import android.provider.CalendarContract.Attendees;
+import android.provider.CalendarContract.Calendars;
+import android.provider.CalendarContract.Instances;
 import android.text.format.DateUtils;
 import android.text.format.Time;
 import android.util.Log;
@@ -292,7 +292,7 @@ public class CalendarAppWidgetService extends RemoteViewsService {
             IntentFilter filter = new IntentFilter();
             filter.addAction(CalendarAppWidgetProvider.ACTION_CALENDAR_APPWIDGET_SCHEDULED_UPDATE);
             filter.addDataScheme(ContentResolver.SCHEME_CONTENT);
-            filter.addDataAuthority(Calendar.AUTHORITY, null);
+            filter.addDataAuthority(CalendarContract.AUTHORITY, null);
             try {
                 filter.addDataType(CalendarAppWidgetProvider.APPWIDGET_DATA_TYPE);
             } catch (MalformedMimeTypeException e) {
@@ -303,7 +303,7 @@ public class CalendarAppWidgetService extends RemoteViewsService {
             filter = new IntentFilter();
             filter.addAction(Intent.ACTION_PROVIDER_CHANGED);
             filter.addDataScheme(ContentResolver.SCHEME_CONTENT);
-            filter.addDataAuthority(Calendar.AUTHORITY, null);
+            filter.addDataAuthority(CalendarContract.AUTHORITY, null);
             mContext.registerReceiver(this, filter);
 
             filter = new IntentFilter();