Rename calendarcommon to calendarcommon2 to workaround OEM silliness

Change-Id: I5bd618866d6484037671376e192ee3217c42c366

13 files changed, 20 insertions, 20 deletions

diff --git a/README b/README
index bfb9a28..62fbf41 100644
--- a/README
+++ b/README
@@ -2,4 +2,4 @@ To build and run tests:
 
 mmm -j20 frameworks/opt/calendar
 adb install -r $OUT/data/app/CalendarCommonTests.apk
-adb shell am instrument -w com.android.calendarcommon.tests/android.test.InstrumentationTestRunner
+adb shell am instrument -w com.android.calendarcommon2.tests/android.test.InstrumentationTestRunner
diff --git a/src/com/android/calendarcommon/DateException.java b/src/com/android/calendarcommon2/DateException.java
index c917885..0221274 100644
--- a/src/com/android/calendarcommon/DateException.java
+++ b/src/com/android/calendarcommon2/DateException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.calendarcommon;
+package com.android.calendarcommon2;
 
 public class DateException extends Exception
 {
diff --git a/src/com/android/calendarcommon/Duration.java b/src/com/android/calendarcommon2/Duration.java
index 70fe89d..dad7f74 100644
--- a/src/com/android/calendarcommon/Duration.java
+++ b/src/com/android/calendarcommon2/Duration.java
@@ -14,7 +14,7 @@
 ** limitations under the License.
 */
 
-package com.android.calendarcommon;
+package com.android.calendarcommon2;
 
 import java.util.Calendar;
 
diff --git a/src/com/android/calendarcommon/EventRecurrence.java b/src/com/android/calendarcommon2/EventRecurrence.java
index ac03e45..45fd12f 100644
--- a/src/com/android/calendarcommon/EventRecurrence.java
+++ b/src/com/android/calendarcommon2/EventRecurrence.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.calendarcommon;
+package com.android.calendarcommon2;
 
 import android.text.TextUtils;
 import android.text.format.Time;
diff --git a/src/com/android/calendarcommon/ICalendar.java b/src/com/android/calendarcommon2/ICalendar.java
index 2374706..1bf33fe 100644
--- a/src/com/android/calendarcommon/ICalendar.java
+++ b/src/com/android/calendarcommon2/ICalendar.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.calendarcommon;
+package com.android.calendarcommon2;
 
 import android.util.Log;
 
diff --git a/src/com/android/calendarcommon/RecurrenceProcessor.java b/src/com/android/calendarcommon2/RecurrenceProcessor.java
index 82b699b..641a161 100644
--- a/src/com/android/calendarcommon/RecurrenceProcessor.java
+++ b/src/com/android/calendarcommon2/RecurrenceProcessor.java
@@ -15,7 +15,7 @@
 ** limitations under the License.
 */
 
-package com.android.calendarcommon;
+package com.android.calendarcommon2;
 
 import android.text.format.Time;
 import android.util.Log;
diff --git a/src/com/android/calendarcommon/RecurrenceSet.java b/src/com/android/calendarcommon2/RecurrenceSet.java
index d8fb7cf..9ee0ae9 100644
--- a/src/com/android/calendarcommon/RecurrenceSet.java
+++ b/src/com/android/calendarcommon2/RecurrenceSet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.calendarcommon;
+package com.android.calendarcommon2;
 
 import android.content.ContentValues;
 import android.database.Cursor;
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 779b74a..040e885 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -15,13 +15,13 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.calendarcommon.tests">
+        package="com.android.calendarcommon2.tests">
 
     <application>
         <uses-library android:name="android.test.runner" />
     </application>
 
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-            android:targetPackage="com.android.calendarcommon.tests"
+            android:targetPackage="com.android.calendarcommon2.tests"
             android:label="TestRunner letting users run CalendarCommon Library Tests" />
 </manifest>
diff --git a/tests/src/com/android/calendarcommon/DurationTest.java b/tests/src/com/android/calendarcommon2/DurationTest.java
index b264713..39320a3 100644
--- a/tests/src/com/android/calendarcommon/DurationTest.java
+++ b/tests/src/com/android/calendarcommon2/DurationTest.java
@@ -15,7 +15,7 @@
 ** limitations under the License.
 */
 
-package com.android.calendarcommon;
+package com.android.calendarcommon2;
 
 import junit.framework.TestCase;
 
diff --git a/tests/src/com/android/calendarcommon/EventRecurrenceTest.java b/tests/src/com/android/calendarcommon2/EventRecurrenceTest.java
index efd5f1c..c25e3ec 100644
--- a/tests/src/com/android/calendarcommon/EventRecurrenceTest.java
+++ b/tests/src/com/android/calendarcommon2/EventRecurrenceTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.calendarcommon;
+package com.android.calendarcommon2;
 
-import com.android.calendarcommon.EventRecurrence.InvalidFormatException;
+import com.android.calendarcommon2.EventRecurrence.InvalidFormatException;
 
 import android.test.suitebuilder.annotation.SmallTest;
 import android.test.suitebuilder.annotation.Suppress;
@@ -28,8 +28,8 @@ import java.util.Arrays;
 /**
  * Test android.pim.EventRecurrence.
  *
- * adb shell am instrument -w -e class com.android.calendarcommon.EventRecurrenceTest \
- *   com.android.calendarcommon.tests/android.test.InstrumentationTestRunner
+ * adb shell am instrument -w -e class com.android.calendarcommon2.EventRecurrenceTest \
+ *   com.android.calendarcommon2.tests/android.test.InstrumentationTestRunner
  */
 public class EventRecurrenceTest extends TestCase {
 
diff --git a/tests/src/com/android/calendarcommon/RRuleTest.java b/tests/src/com/android/calendarcommon2/RRuleTest.java
index 743e236..53988e2 100644
--- a/tests/src/com/android/calendarcommon/RRuleTest.java
+++ b/tests/src/com/android/calendarcommon2/RRuleTest.java
@@ -17,9 +17,9 @@
 
 /* Based on http://code.google.com/p/google-rfc-2445/source/browse/trunk/test/com/google/ical/iter/RRuleIteratorImplTest.java */
 
-package com.android.calendarcommon;
+package com.android.calendarcommon2;
 
-import com.android.calendarcommon.RecurrenceSet;
+import com.android.calendarcommon2.RecurrenceSet;
 
 import android.os.Debug;
 import android.test.suitebuilder.annotation.MediumTest;
diff --git a/tests/src/com/android/calendarcommon/RecurrenceProcessorTest.java b/tests/src/com/android/calendarcommon2/RecurrenceProcessorTest.java
index ba5ec0c..af850f8 100644
--- a/tests/src/com/android/calendarcommon/RecurrenceProcessorTest.java
+++ b/tests/src/com/android/calendarcommon2/RecurrenceProcessorTest.java
@@ -15,7 +15,7 @@
 ** limitations under the License.
 */
 
-package com.android.calendarcommon;
+package com.android.calendarcommon2;
 
 import android.os.Debug;
 import android.test.suitebuilder.annotation.LargeTest;
diff --git a/tests/src/com/android/calendarcommon/RecurrenceSetTest.java b/tests/src/com/android/calendarcommon2/RecurrenceSetTest.java
index 3b348b0..f65c780 100644
--- a/tests/src/com/android/calendarcommon/RecurrenceSetTest.java
+++ b/tests/src/com/android/calendarcommon2/RecurrenceSetTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.calendarcommon;
+package com.android.calendarcommon2;
 
-import com.android.calendarcommon.ICalendar;
-import com.android.calendarcommon.RecurrenceSet;
+import com.android.calendarcommon2.ICalendar;
+import com.android.calendarcommon2.RecurrenceSet;
 
 import android.content.ContentValues;
 import android.test.suitebuilder.annotation.SmallTest;