Always use a consistent name for SharedPreferences.

The code was relying on the package name for
SharedPreferences, which is problematic if running
under a new package name.

Also, remove the use of the shared user ID.

Change-Id: I9d2c8c78588d7b9868318153d0788addb84f11a6
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b6b577a..365e6ea 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,11 +19,14 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.android.calendar"
-        android:sharedUserId="android.uid.calendar"
         android:sharedUserLabel="@string/app_label">
 
-    <original-package android:name="com.android.calendar" />
+    <!--
+       NOTE: and original-package cannot be used, since the Eclair
+       version was using a shared user ID with the provider.
+    -->
 
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.READ_CONTACTS"/>