diff options
author | Chris Wren <cwren@android.com> | 2013-12-09 18:52:36 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-12-09 18:52:36 +0000 |
commit | 06a0ac2fea10bde7f5a45e72dea83308773a220d (patch) | |
tree | da538ef3e0182f2e46f4738cc9011bdcbf4c638e /src/com/android | |
parent | 5d518fa77c56a65104f02f40269ad8e43f3431b2 (diff) | |
parent | 45297f851af715b2a0367459089a7a8f9c39b8fd (diff) | |
download | android_packages_apps_Trebuchet-06a0ac2fea10bde7f5a45e72dea83308773a220d.tar.gz android_packages_apps_Trebuchet-06a0ac2fea10bde7f5a45e72dea83308773a220d.tar.bz2 android_packages_apps_Trebuchet-06a0ac2fea10bde7f5a45e72dea83308773a220d.zip |
Merge "backup launcher preferences" into jb-ub-now-kermit
Diffstat (limited to 'src/com/android')
-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 8023fcd36..2a5ed6961 100644 --- a/src/com/android/launcher3/LauncherBackupHelper.java +++ b/src/com/android/launcher3/LauncherBackupHelper.java @@ -82,6 +82,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; |