summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2014-01-14 11:10:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-01-14 11:10:49 +0000
commitfe45a82ed90bd9e8d949c210d905fcf38e64aaf2 (patch)
tree982e4755d4dd1f51b396f6e7bb491322641e8f0e
parent574120cdca5bfd124a96d102c0c59814a1be076a (diff)
parent8b51b173209a9627157172f22fa23fa36065b061 (diff)
downloadandroid_packages_apps_Trebuchet-fe45a82ed90bd9e8d949c210d905fcf38e64aaf2.zip
android_packages_apps_Trebuchet-fe45a82ed90bd9e8d949c210d905fcf38e64aaf2.tar.gz
android_packages_apps_Trebuchet-fe45a82ed90bd9e8d949c210d905fcf38e64aaf2.tar.bz2
Merge "Move saved wallpaper images from cache directory to data directory" into jb-ub-now-kermit
-rw-r--r--WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java14
1 files changed, 13 insertions, 1 deletions
diff --git a/WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java b/WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java
index 58add70..44bfdf1 100644
--- a/WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java
+++ b/WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java
@@ -85,6 +85,9 @@ public class SavedWallpaperImages extends BaseAdapter implements ListAdapter {
}
public SavedWallpaperImages(Activity context) {
+ // We used to store the saved images in the cache directory, but that meant they'd get
+ // deleted sometimes-- move them to the data directory
+ ImageDb.moveFromCacheDirectoryIfNecessary(context);
mDb = new ImageDb(context);
mContext = context;
mLayoutInflater = context.getLayoutInflater();
@@ -215,11 +218,20 @@ public class SavedWallpaperImages extends BaseAdapter implements ListAdapter {
Context mContext;
public ImageDb(Context context) {
- super(context, new File(context.getCacheDir(), DB_NAME).getPath(), null, DB_VERSION);
+ super(context, context.getDatabasePath(DB_NAME).getPath(), null, DB_VERSION);
// Store the context for later use
mContext = context;
}
+ public static void moveFromCacheDirectoryIfNecessary(Context context) {
+ // We used to store the saved images in the cache directory, but that meant they'd get
+ // deleted sometimes-- move them to the data directory
+ File oldSavedImagesFile = new File(context.getCacheDir(), ImageDb.DB_NAME);
+ File savedImagesFile = context.getDatabasePath(ImageDb.DB_NAME);
+ if (oldSavedImagesFile.exists()) {
+ oldSavedImagesFile.renameTo(savedImagesFile);
+ }
+ }
@Override
public void onCreate(SQLiteDatabase database) {
database.execSQL("CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " (" +