Trebuchet : Use consistent shared_prefs

PreferenceFragments by default use getDefaultSharedPreferences(), which
is inconsistent with the rest of our settings.

This patch ensures its consistent and renames SETTINGS_KEY away from
package name space to avoid future confusion.

Change-Id: Ic6323a6b392e01b27f7ba20cbd61ec9705bc5845

2 files changed, 7 insertions, 1 deletions

diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index 88c1c9306..466a01f67 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -51,6 +51,12 @@ public class SettingsActivity extends PreferenceActivity
     }
 
     @Override
+    public SharedPreferences getSharedPreferences(String name, int mode) {
+        return super.getSharedPreferences(SettingsProvider.SETTINGS_KEY,
+                Context.MODE_PRIVATE);
+    }
+
+    @Override
     protected void onResume() {
         super.onResume();
         mSettings.registerOnSharedPreferenceChangeListener(this);
diff --git a/src/com/android/launcher3/settings/SettingsProvider.java b/src/com/android/launcher3/settings/SettingsProvider.java
index 405a7eba6..8ef3c9c7f 100644
--- a/src/com/android/launcher3/settings/SettingsProvider.java
+++ b/src/com/android/launcher3/settings/SettingsProvider.java
@@ -20,7 +20,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 
 public final class SettingsProvider {
-    public static final String SETTINGS_KEY = "com.cyanogenmod.trebuchet_preferences";
+    public static final String SETTINGS_KEY = "trebuchet_preferences";
 
     public static final String SETTINGS_CHANGED = "settings_changed";