Permalink
Browse files

Relocate common Calendar classes

Move some classes from android.pim to com.android.calendarcommon.

Bug 4575374

Change-Id: I3cb6a59bf761b97973c2590f71bdf8e28575adb0
  • Loading branch information...
fadden committed Jul 6, 2011
1 parent 32aa776 commit 93e0bbb921cce7a5cec355521bc570c03c9d6a1c
View
@@ -19,7 +19,8 @@ include $(CLEAR_VARS)
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 += \
@@ -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;
@@ -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;
@@ -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;
View
@@ -9,7 +9,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CalendarProviderTests
-LOCAL_JAVA_LIBRARIES := ext android.test.runner
+LOCAL_JAVA_LIBRARIES := ext android.test.runner calendar-common
LOCAL_INSTRUMENTATION_FOR := CalendarProvider
@@ -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;
@@ -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;
@@ -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;
@@ -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;

0 comments on commit 93e0bbb

Please sign in to comment.