commit a969e942aae1263828ecae909481f2be837be4cf
author Ken Shirriff <kens@google.com> Mon Oct 19 14:06:00 2009 -0700
committer Ken Shirriff <kens@google.com> Fri Dec 04 11:06:29 2009 -0800
tree f35c3cbb64a7fb9c3bdf9cec78f31de925669058
parent 02e5564690b3bb30d4f9cebfff7e4b94009098ba

Add commented-out support for CalendarProvider2.

CalendarProvider2 supports the new calendar sync adapter.

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7595b1c..e92de57 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -39,6 +39,9 @@
         <!-- TODO: Remove dependency of application on the test runner
              (android.test) library. -->
         <uses-library android:name="android.test.runner" />
+
+        <!-- NOTE: to use new calendar provider, comment out CalendarProvider
+        and CalendarSyncAdapterService, and uncomment CalendarProvider2 -->
         <provider android:name="CalendarProvider" android:authorities="calendar"
                 android:label="@string/provider_label"
                 android:multiprocess="false"
@@ -51,6 +54,14 @@
             <meta-data android:name="android.content.SyncAdapter"
                        android:resource="@xml/syncadapter" />
         </service>
+        <!--
+        <provider android:name="CalendarProvider2" android:authorities="calendar"
+                android:label="@string/provider_label"
+                android:multiprocess="false"
+                android:readPermission="android.permission.READ_CALENDAR"
+                android:writePermission="android.permission.WRITE_CALENDAR" />
+        -->
+
         <activity android:name="CalendarContentProviderTests" android:label="Calendar Content Provider">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />