Relocate common Calendar classes
Move some classes from android.pim to com.android.calendarcommon.
Bug 4575374
Change-Id: I3cb6a59bf761b97973c2590f71bdf8e28575adb0
diff --git a/Android.mk b/Android.mk
index fc05d16..099169c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,7 +19,8 @@
LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_JAVA_LIBRARIES := guava \
- android-common
+ android-common \
+ calendar-common
LOCAL_SRC_FILES := $(call all-java-files-under,src)
LOCAL_SRC_FILES += \
diff --git a/src/com/android/providers/calendar/CalendarInstancesHelper.java b/src/com/android/providers/calendar/CalendarInstancesHelper.java
index a803978..3bd2137 100644
--- a/src/com/android/providers/calendar/CalendarInstancesHelper.java
+++ b/src/com/android/providers/calendar/CalendarInstancesHelper.java
@@ -16,15 +16,16 @@
package com.android.providers.calendar;
+import com.android.calendarcommon.EventRecurrence;
+import com.android.calendarcommon.RecurrenceSet;
import com.android.providers.calendar.CalendarDatabaseHelper.Tables;
+
import android.content.ContentValues;
import android.database.Cursor;
import android.database.DatabaseUtils;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteQueryBuilder;
import android.os.Debug;
-import android.pim.EventRecurrence;
-import android.pim.RecurrenceSet;
import android.provider.CalendarContract.Calendars;
import android.provider.CalendarContract.Events;
import android.provider.CalendarContract.Instances;
diff --git a/src/com/android/providers/calendar/CalendarProvider2.java b/src/com/android/providers/calendar/CalendarProvider2.java
index 27b88e3..b463791 100644
--- a/src/com/android/providers/calendar/CalendarProvider2.java
+++ b/src/com/android/providers/calendar/CalendarProvider2.java
@@ -17,6 +17,8 @@
package com.android.providers.calendar;
+import com.android.calendarcommon.EventRecurrence;
+import com.android.calendarcommon.RecurrenceSet;
import com.android.providers.calendar.CalendarDatabaseHelper.Tables;
import com.android.providers.calendar.CalendarDatabaseHelper.Views;
import com.google.common.annotations.VisibleForTesting;
@@ -41,8 +43,6 @@
import android.os.Handler;
import android.os.Message;
import android.os.Process;
-import android.pim.EventRecurrence;
-import android.pim.RecurrenceSet;
import android.provider.BaseColumns;
import android.provider.CalendarContract;
import android.provider.CalendarContract.Attendees;
diff --git a/src/com/android/providers/calendar/RecurrenceProcessor.java b/src/com/android/providers/calendar/RecurrenceProcessor.java
index b52322c..24fef65 100644
--- a/src/com/android/providers/calendar/RecurrenceProcessor.java
+++ b/src/com/android/providers/calendar/RecurrenceProcessor.java
@@ -17,8 +17,9 @@
package com.android.providers.calendar;
-import android.pim.EventRecurrence;
-import android.pim.RecurrenceSet;
+import com.android.calendarcommon.EventRecurrence;
+import com.android.calendarcommon.RecurrenceSet;
+
import android.text.format.Time;
import android.util.Log;
diff --git a/tests/Android.mk b/tests/Android.mk
index fe73983..f15b9ab 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -9,7 +9,7 @@
LOCAL_PACKAGE_NAME := CalendarProviderTests
-LOCAL_JAVA_LIBRARIES := ext android.test.runner
+LOCAL_JAVA_LIBRARIES := ext android.test.runner calendar-common
LOCAL_INSTRUMENTATION_FOR := CalendarProvider
diff --git a/tests/src/com/android/providers/calendar/ICalendarTest.java b/tests/src/com/android/providers/calendar/ICalendarTest.java
index f50d62f..4a740a9 100644
--- a/tests/src/com/android/providers/calendar/ICalendarTest.java
+++ b/tests/src/com/android/providers/calendar/ICalendarTest.java
@@ -1,7 +1,8 @@
// Copyright 2007 The Android Open Source Project
package com.android.providers.calendar;
-import android.pim.ICalendar;
+import com.android.calendarcommon.ICalendar;
+
import android.test.suitebuilder.annotation.SmallTest;
import junit.framework.TestCase;
diff --git a/tests/src/com/android/providers/calendar/RRuleTest.java b/tests/src/com/android/providers/calendar/RRuleTest.java
index f8f98e0..1d35d1d 100644
--- a/tests/src/com/android/providers/calendar/RRuleTest.java
+++ b/tests/src/com/android/providers/calendar/RRuleTest.java
@@ -19,8 +19,9 @@
package com.android.providers.calendar;
+import com.android.calendarcommon.RecurrenceSet;
+
import android.os.Debug;
-import android.pim.RecurrenceSet;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.Suppress;
import android.text.format.Time;
diff --git a/tests/src/com/android/providers/calendar/RecurrenceProcessorTest.java b/tests/src/com/android/providers/calendar/RecurrenceProcessorTest.java
index 5694a48..416fda0 100644
--- a/tests/src/com/android/providers/calendar/RecurrenceProcessorTest.java
+++ b/tests/src/com/android/providers/calendar/RecurrenceProcessorTest.java
@@ -17,8 +17,9 @@
package com.android.providers.calendar;
+import com.android.calendarcommon.RecurrenceSet;
+
import android.os.Debug;
-import android.pim.RecurrenceSet;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.SmallTest;
diff --git a/tests/src/com/android/providers/calendar/RecurrenceSetTest.java b/tests/src/com/android/providers/calendar/RecurrenceSetTest.java
index 794b604..2ce7167 100644
--- a/tests/src/com/android/providers/calendar/RecurrenceSetTest.java
+++ b/tests/src/com/android/providers/calendar/RecurrenceSetTest.java
@@ -16,9 +16,10 @@
package com.android.providers.calendar;
+import com.android.calendarcommon.ICalendar;
+import com.android.calendarcommon.RecurrenceSet;
+
import android.content.ContentValues;
-import android.pim.ICalendar;
-import android.pim.RecurrenceSet;
import android.provider.CalendarContract;
import android.test.suitebuilder.annotation.SmallTest;
import junit.framework.TestCase;