diff options
author | Chris Wren <cwren@android.com> | 2013-10-17 15:16:48 -0400 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2014-06-06 22:54:21 -0700 |
commit | fc51446bff87a88b0ff1a8e54133f81ae15a47da (patch) | |
tree | 1cdd17e9baffef5eea58ae5a0c8aceb4ffda7576 /src/com/android/launcher3 | |
parent | df2df99a6cc6fef5a6eefcd9283da6c456cc0a24 (diff) | |
download | android_packages_apps_Trebuchet-fc51446bff87a88b0ff1a8e54133f81ae15a47da.tar.gz android_packages_apps_Trebuchet-fc51446bff87a88b0ff1a8e54133f81ae15a47da.tar.bz2 android_packages_apps_Trebuchet-fc51446bff87a88b0ff1a8e54133f81ae15a47da.zip |
backup launcher preferences
Bug: 11267816
Change-Id: I12a32477164fe2205bc8cb02e0a23c561a7f9189
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r-- | src/com/android/launcher3/LauncherBackupAgentHelper.java | 16 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherBackupHelper.java | 2 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/com/android/launcher3/LauncherBackupAgentHelper.java b/src/com/android/launcher3/LauncherBackupAgentHelper.java index 2b5059b72..83e4a60d4 100644 --- a/src/com/android/launcher3/LauncherBackupAgentHelper.java +++ b/src/com/android/launcher3/LauncherBackupAgentHelper.java @@ -18,10 +18,14 @@ package com.android.launcher3; import android.app.backup.BackupAgentHelper; import android.app.backup.BackupManager; +import android.app.backup.SharedPreferencesBackupHelper; import android.content.Context; +import android.content.SharedPreferences; public class LauncherBackupAgentHelper extends BackupAgentHelper { + private static final String TAG = "LauncherBackupAgentHelper"; + private static BackupManager sBackupManager; /** @@ -38,9 +42,21 @@ public class LauncherBackupAgentHelper extends BackupAgentHelper { sBackupManager.dataChanged(); } + @Override + public void onDestroy() { + // There is only one process accessing this preference file, but the restore + // modifies the file outside the normal codepaths, so it looks like another + // process. This forces a reload of the file, in case this process persists. + String spKey = LauncherAppState.getSharedPreferencesKey(); + SharedPreferences sp = getSharedPreferences(spKey, Context.MODE_MULTI_PROCESS); + super.onDestroy(); + } @Override public void onCreate() { + addHelper(LauncherBackupHelper.LAUNCHER_PREFS_PREFIX, + new SharedPreferencesBackupHelper(this, + LauncherAppState.getSharedPreferencesKey())); addHelper(LauncherBackupHelper.LAUNCHER_PREFIX, new LauncherBackupHelper(this)); } } diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java index 9b901eea1..d84d087c1 100644 --- a/src/com/android/launcher3/LauncherBackupHelper.java +++ b/src/com/android/launcher3/LauncherBackupHelper.java @@ -83,6 +83,8 @@ public class LauncherBackupHelper implements BackupHelper { public static final String LAUNCHER_PREFIX = "L"; + public static final String LAUNCHER_PREFS_PREFIX = "LP"; + private static final Bitmap.CompressFormat IMAGE_FORMAT = android.graphics.Bitmap.CompressFormat.PNG; |