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

11 files changed, 37 insertions, 16 deletions

diff --git a/src/com/android/calendar/AgendaActivity.java b/src/com/android/calendar/AgendaActivity.java
index b4140330..0d86f074 100644
--- a/src/com/android/calendar/AgendaActivity.java
+++ b/src/com/android/calendar/AgendaActivity.java
@@ -138,10 +138,10 @@ public class AgendaActivity extends Activity implements Navigator {
             Log.v(TAG, "OnResume to " + mTime.toString());
         }
 
-        SharedPreferences prefs =
-            PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-        boolean hideDeclined = prefs
-                .getBoolean(CalendarPreferenceActivity.KEY_HIDE_DECLINED, false);
+        SharedPreferences prefs = CalendarPreferenceActivity.getSharedPreferences(
+                getApplicationContext());
+        boolean hideDeclined = prefs.getBoolean(
+                CalendarPreferenceActivity.KEY_HIDE_DECLINED, false);
 
         mAgendaListView.setHideDeclinedEvents(hideDeclined);
         mAgendaListView.goTo(mTime, true);
diff --git a/src/com/android/calendar/AlertService.java b/src/com/android/calendar/AlertService.java
index f06ba50a..a272a6d8 100644
--- a/src/com/android/calendar/AlertService.java
+++ b/src/com/android/calendar/AlertService.java
@@ -248,7 +248,7 @@ public class AlertService extends Service {
             }
         }
 
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences prefs = CalendarPreferenceActivity.getSharedPreferences(context);
         String reminderType = prefs.getString(CalendarPreferenceActivity.KEY_ALERTS_TYPE,
                 CalendarPreferenceActivity.ALERT_TYPE_STATUS_BAR);
 
diff --git a/src/com/android/calendar/CalendarApplication.java b/src/com/android/calendar/CalendarApplication.java
index 424e4229..129b7c2e 100644
--- a/src/com/android/calendar/CalendarApplication.java
+++ b/src/com/android/calendar/CalendarApplication.java
@@ -17,8 +17,8 @@
 package com.android.calendar;
 
 import android.app.Application;
+import android.content.Context;
 import android.preference.PreferenceManager;
-import android.util.Log;
 
 public class CalendarApplication extends Application {
 
@@ -78,7 +78,7 @@ public class CalendarApplication extends Application {
          * Ensure the default values are set for any receiver, activity,
          * service, etc. of Calendar
          */
-        PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
+        CalendarPreferenceActivity.setDefaultValues(this);
     }
 
 }
diff --git a/src/com/android/calendar/CalendarPreferenceActivity.java b/src/com/android/calendar/CalendarPreferenceActivity.java
index 5d5358b0..3b1dd277 100644
--- a/src/com/android/calendar/CalendarPreferenceActivity.java
+++ b/src/com/android/calendar/CalendarPreferenceActivity.java
@@ -16,16 +16,22 @@
 
 package com.android.calendar;
 
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.PreferenceActivity;
+import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.preference.RingtonePreference;
 
 public class CalendarPreferenceActivity extends PreferenceActivity implements OnSharedPreferenceChangeListener {
+    // The name of the shared preferences file. This name must be maintained for historical
+    // reasons, as it's what PreferenceManager assigned the first time the file was created.
+    private static final String SHARED_PREFS_NAME = "com.android.calendar_preferences";
+
     // Preference keys
     static final String KEY_HIDE_DECLINED = "preferences_hide_declined";
     static final String KEY_ALERTS_TYPE = "preferences_alerts_type";
@@ -51,10 +57,25 @@ public class CalendarPreferenceActivity extends PreferenceActivity implements On
     CheckBoxPreference mVibrate;
     RingtonePreference mRingtone;
 
+    /** Return a properly configured SharedPreferences instance */
+    public static SharedPreferences getSharedPreferences(Context context) {
+        return context.getSharedPreferences(SHARED_PREFS_NAME, Context.MODE_PRIVATE);
+    }
+
+    /** Set the default shared preferences in the proper context */
+    public static void setDefaultValues(Context context) {
+        PreferenceManager.setDefaultValues(context, SHARED_PREFS_NAME, Context.MODE_PRIVATE,
+                R.xml.preferences, false);
+    }
+
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
+        // Make sure to always use the same preferences file regardless of the package name
+        // we're running under
+        getPreferenceManager().setSharedPreferencesName(SHARED_PREFS_NAME);
+        
         // Load the preferences from an XML resource
         addPreferencesFromResource(R.xml.preferences);
 
diff --git a/src/com/android/calendar/EditEvent.java b/src/com/android/calendar/EditEvent.java
index 66491549..15ee1f37 100644
--- a/src/com/android/calendar/EditEvent.java
+++ b/src/com/android/calendar/EditEvent.java
@@ -760,7 +760,7 @@ public class EditEvent extends Activity implements View.OnClickListener,
         String[] labels = r.getStringArray(R.array.reminder_minutes_labels);
         mReminderLabels = new ArrayList<String>(Arrays.asList(labels));
 
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        SharedPreferences prefs = CalendarPreferenceActivity.getSharedPreferences(this);
         String durationString =
                 prefs.getString(CalendarPreferenceActivity.KEY_DEFAULT_REMINDER, "0");
         mDefaultReminderMinutes = Integer.parseInt(durationString);
diff --git a/src/com/android/calendar/Event.java b/src/com/android/calendar/Event.java
index 956a0f6c..c3789a7e 100644
--- a/src/com/android/calendar/Event.java
+++ b/src/com/android/calendar/Event.java
@@ -298,7 +298,7 @@ public class Event implements Comparable, Cloneable {
             String orderBy = Instances.SORT_CALENDAR_VIEW;
 
             // Respect the preference to show/hide declined events
-            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+            SharedPreferences prefs = CalendarPreferenceActivity.getSharedPreferences(context);
             boolean hideDeclined = prefs.getBoolean(CalendarPreferenceActivity.KEY_HIDE_DECLINED,
                     false);
 
diff --git a/src/com/android/calendar/EventInfoActivity.java b/src/com/android/calendar/EventInfoActivity.java
index c108afca..29f17322 100644
--- a/src/com/android/calendar/EventInfoActivity.java
+++ b/src/com/android/calendar/EventInfoActivity.java
@@ -364,7 +364,7 @@ public class EventInfoActivity extends Activity implements View.OnClickListener,
         String[] labels = r.getStringArray(R.array.reminder_minutes_labels);
         mReminderLabels = new ArrayList<String>(Arrays.asList(labels));
 
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        SharedPreferences prefs = CalendarPreferenceActivity.getSharedPreferences(this);
         String durationString =
                 prefs.getString(CalendarPreferenceActivity.KEY_DEFAULT_REMINDER, "0");
         mDefaultReminderMinutes = Integer.parseInt(durationString);
diff --git a/src/com/android/calendar/LaunchActivity.java b/src/com/android/calendar/LaunchActivity.java
index 62dba1c8..946f9466 100644
--- a/src/com/android/calendar/LaunchActivity.java
+++ b/src/com/android/calendar/LaunchActivity.java
@@ -92,7 +92,7 @@ public class LaunchActivity extends Activity {
         }
         intent.putExtras(myIntent);
 
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        SharedPreferences prefs = CalendarPreferenceActivity.getSharedPreferences(this);
         String startActivity = prefs.getString(defaultViewKey,
                 CalendarPreferenceActivity.DEFAULT_START_VIEW);
 
diff --git a/src/com/android/calendar/MonthActivity.java b/src/com/android/calendar/MonthActivity.java
index 75ebe45e..ec7c670f 100644
--- a/src/com/android/calendar/MonthActivity.java
+++ b/src/com/android/calendar/MonthActivity.java
@@ -299,7 +299,7 @@ public class MonthActivity extends Activity implements ViewSwitcher.ViewFactory,
 
         MonthView view1 = (MonthView) mSwitcher.getCurrentView();
         MonthView view2 = (MonthView) mSwitcher.getNextView();
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        SharedPreferences prefs = CalendarPreferenceActivity.getSharedPreferences(this);
         String str = prefs.getString(CalendarPreferenceActivity.KEY_DETAILED_VIEW,
                 CalendarPreferenceActivity.DEFAULT_DETAILED_VIEW);
         view1.setDetailedView(str);
diff --git a/src/com/android/calendar/Utils.java b/src/com/android/calendar/Utils.java
index 55cbfba9..7dd3da2c 100644
--- a/src/com/android/calendar/Utils.java
+++ b/src/com/android/calendar/Utils.java
@@ -40,12 +40,12 @@ public class Utils {
     }
 
     static String getSharedPreference(Context context, String key, String defaultValue) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences prefs = CalendarPreferenceActivity.getSharedPreferences(context);
         return prefs.getString(key, defaultValue);
     }
 
     static void setSharedPreference(Context context, String key, String value) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences prefs = CalendarPreferenceActivity.getSharedPreferences(context);
         SharedPreferences.Editor editor = prefs.edit();
         editor.putString(key, value);
         editor.commit();
@@ -54,7 +54,7 @@ public class Utils {
     static void setDefaultView(Context context, int viewId) {
         String activityString = CalendarApplication.ACTIVITY_NAMES[viewId];
 
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences prefs = CalendarPreferenceActivity.getSharedPreferences(context);
         SharedPreferences.Editor editor = prefs.edit();
         if (viewId == CalendarApplication.AGENDA_VIEW_ID ||
                 viewId == CalendarApplication.DAY_VIEW_ID) {
diff --git a/src/com/android/calendar/WeekActivity.java b/src/com/android/calendar/WeekActivity.java
index eb4067d8..5bfdd3a2 100644
--- a/src/com/android/calendar/WeekActivity.java
+++ b/src/com/android/calendar/WeekActivity.java
@@ -72,7 +72,7 @@ public class WeekActivity extends CalendarActivity implements ViewSwitcher.ViewF
 
         CalendarView view1 = (CalendarView) mViewSwitcher.getCurrentView();
         CalendarView view2 = (CalendarView) mViewSwitcher.getNextView();
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        SharedPreferences prefs = CalendarPreferenceActivity.getSharedPreferences(this);
 
         String str = prefs.getString(CalendarPreferenceActivity.KEY_DETAILED_VIEW,
                 CalendarPreferenceActivity.DEFAULT_DETAILED_VIEW);