1 files changed, 31 insertions, 23 deletions
diff --git a/src/com/android/wallpaper/module/DefaultWallpaperPreferences.java b/src/com/android/wallpaper/module/DefaultWallpaperPreferences.java
index c2cd07b4..6f945a90 100755
--- a/src/com/android/wallpaper/module/DefaultWallpaperPreferences.java
+++ b/src/com/android/wallpaper/module/DefaultWallpaperPreferences.java
@@ -47,6 +47,7 @@ import java.util.TimeZone;
  * Default implementation that writes to and reads from SharedPreferences.
  */
 public class DefaultWallpaperPreferences implements WallpaperPreferences {
+
     public static final String PREFS_NAME = "wallpaper";
     public static final String NO_BACKUP_PREFS_NAME = "wallpaper-nobackup";
 
@@ -154,10 +155,6 @@ public class DefaultWallpaperPreferences implements WallpaperPreferences {
             editor.putInt(NoBackupKeys.KEY_NUM_DAYS_DAILY_ROTATION_NOT_ATTEMPTED,
                     mSharedPrefs.getInt(NoBackupKeys.KEY_NUM_DAYS_DAILY_ROTATION_NOT_ATTEMPTED, 0));
         }
-        if (mSharedPrefs.contains(NoBackupKeys.KEY_HOME_WALLPAPER_PACKAGE_NAME)) {
-            editor.putString(NoBackupKeys.KEY_HOME_WALLPAPER_PACKAGE_NAME,
-                    mSharedPrefs.getString(NoBackupKeys.KEY_HOME_WALLPAPER_PACKAGE_NAME, null));
-        }
         if (mSharedPrefs.contains(NoBackupKeys.KEY_HOME_WALLPAPER_SERVICE_NAME)) {
             editor.putString(NoBackupKeys.KEY_HOME_WALLPAPER_SERVICE_NAME,
                     mSharedPrefs.getString(NoBackupKeys.KEY_HOME_WALLPAPER_SERVICE_NAME, null));
@@ -325,7 +322,7 @@ public class DefaultWallpaperPreferences implements WallpaperPreferences {
                 .apply();
 
         mNoBackupPrefs.edit()
-                .remove(NoBackupKeys.KEY_HOME_WALLPAPER_PACKAGE_NAME)
+                .remove(NoBackupKeys.KEY_HOME_WALLPAPER_SERVICE_NAME)
                 .remove(NoBackupKeys.KEY_HOME_WALLPAPER_MANAGER_ID)
                 .remove(NoBackupKeys.KEY_HOME_WALLPAPER_REMOTE_ID)
                 .remove(NoBackupKeys.KEY_HOME_WALLPAPER_SERVICE_NAME)
@@ -335,19 +332,6 @@ public class DefaultWallpaperPreferences implements WallpaperPreferences {
     }
 
     @Override
-    public String getHomeWallpaperPackageName() {
-        return mNoBackupPrefs.getString(
-                NoBackupKeys.KEY_HOME_WALLPAPER_PACKAGE_NAME, null);
-    }
-
-    @Override
-    public void setHomeWallpaperPackageName(String packageName) {
-        mNoBackupPrefs.edit().putString(
-                NoBackupKeys.KEY_HOME_WALLPAPER_PACKAGE_NAME, packageName)
-                .apply();
-    }
-
-    @Override
     public String getHomeWallpaperServiceName() {
         return mNoBackupPrefs.getString(
                 NoBackupKeys.KEY_HOME_WALLPAPER_SERVICE_NAME, null);
@@ -542,6 +526,17 @@ public class DefaultWallpaperPreferences implements WallpaperPreferences {
     }
 
     @Override
+    public String getLockWallpaperServiceName() {
+        return mNoBackupPrefs.getString(NoBackupKeys.KEY_LOCK_WALLPAPER_SERVICE_NAME, null);
+    }
+
+    @Override
+    public void setLockWallpaperServiceName(String serviceName) {
+        mNoBackupPrefs.edit().putString(NoBackupKeys.KEY_LOCK_WALLPAPER_SERVICE_NAME, serviceName)
+                .apply();
+    }
+
+    @Override
     public void addDailyRotation(long timestamp) {
         String jsonString = mNoBackupPrefs.getString(
                 NoBackupKeys.KEY_DAILY_ROTATION_TIMESTAMPS, "[]");
@@ -942,19 +937,32 @@ public class DefaultWallpaperPreferences implements WallpaperPreferences {
             setLockWallpaperCollectionId(collectionId);
             setLockWallpaperRemoteId(wallpaperId);
         }
-        setWallpaperEffects(null);
+        setHomeWallpaperEffects(null);
+    }
+
+    @Override
+    public String getHomeWallpaperEffects() {
+        return mNoBackupPrefs.getString(
+                NoBackupKeys.KEY_HOME_WALLPAPER_EFFECTS, null);
+    }
+
+    @Override
+    public void setHomeWallpaperEffects(String effects) {
+        mNoBackupPrefs.edit().putString(
+                        NoBackupKeys.KEY_HOME_WALLPAPER_EFFECTS, effects)
+                .apply();
     }
 
     @Override
-    public String getWallpaperEffects() {
+    public String getLockWallpaperEffects() {
         return mNoBackupPrefs.getString(
-                NoBackupKeys.KEY_WALLPAPER_EFFECTS, null);
+                NoBackupKeys.KEY_LOCK_WALLPAPER_EFFECTS, null);
     }
 
     @Override
-    public void setWallpaperEffects(String effects) {
+    public void setLockWallpaperEffects(String effects) {
         mNoBackupPrefs.edit().putString(
-                NoBackupKeys.KEY_WALLPAPER_EFFECTS, effects)
+                        NoBackupKeys.KEY_LOCK_WALLPAPER_EFFECTS, effects)
                 .apply();
     }