diff options
author | Helena Josol <helenajosol@google.com> | 2014-10-09 17:04:09 +0100 |
---|---|---|
committer | Helena Josol <helenajosol@google.com> | 2014-10-16 17:35:50 +0100 |
commit | 28db280b7af14614f2b168ea8c5d496cda650321 (patch) | |
tree | d22cd5322a84dd7ba74f0178081fd657893be9f4 /WallpaperPicker/src/com | |
parent | 951e8812abb5a104abbbdd708e69262aa539e6d2 (diff) | |
download | android_packages_apps_Trebuchet-28db280b7af14614f2b168ea8c5d496cda650321.tar.gz android_packages_apps_Trebuchet-28db280b7af14614f2b168ea8c5d496cda650321.tar.bz2 android_packages_apps_Trebuchet-28db280b7af14614f2b168ea8c5d496cda650321.zip |
Add more Launcher files to delete on Clear Launcher Data
Bug: 12753154
Change-Id: I00679bdc6eff70a1398122aaa955c08eabd556b1
Diffstat (limited to 'WallpaperPicker/src/com')
-rw-r--r-- | WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java | 2 | ||||
-rw-r--r-- | WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java index d5c7cd93d..fa8ec64c2 100644 --- a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java +++ b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java @@ -202,7 +202,7 @@ public class WallpaperCropActivity extends Activity { } public static String getSharedPreferencesKey() { - return WallpaperCropActivity.class.getName(); + return LauncherFiles.WALLPAPER_CROP_PREFERENCES_KEY; } // As a ratio of screen height, the total distance we want the parallax effect to span diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java index 07285372e..09e096396 100644 --- a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java +++ b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java @@ -86,8 +86,6 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { public static final int PICK_LIVE_WALLPAPER = 7; private static final String TEMP_WALLPAPER_TILES = "TEMP_WALLPAPER_TILES"; private static final String SELECTED_INDEX = "SELECTED_INDEX"; - private static final String OLD_DEFAULT_WALLPAPER_THUMBNAIL_FILENAME = "default_thumb.jpg"; - private static final String DEFAULT_WALLPAPER_THUMBNAIL_FILENAME = "default_thumb2.jpg"; private static final int FLAG_POST_DELAY_MILLIS = 200; private View mSelectedTile; @@ -999,16 +997,16 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { private File getDefaultThumbFile() { return new File(getFilesDir(), Build.VERSION.SDK_INT - + "_" + DEFAULT_WALLPAPER_THUMBNAIL_FILENAME); + + "_" + LauncherFiles.DEFAULT_WALLPAPER_THUMBNAIL); } private boolean saveDefaultWallpaperThumb(Bitmap b) { // Delete old thumbnails. - new File(getFilesDir(), OLD_DEFAULT_WALLPAPER_THUMBNAIL_FILENAME).delete(); - new File(getFilesDir(), DEFAULT_WALLPAPER_THUMBNAIL_FILENAME).delete(); + new File(getFilesDir(), LauncherFiles.DEFAULT_WALLPAPER_THUMBNAIL_OLD).delete(); + new File(getFilesDir(), LauncherFiles.DEFAULT_WALLPAPER_THUMBNAIL).delete(); for (int i = Build.VERSION_CODES.JELLY_BEAN; i < Build.VERSION.SDK_INT; i++) { - new File(getFilesDir(), i + "_" + DEFAULT_WALLPAPER_THUMBNAIL_FILENAME).delete(); + new File(getFilesDir(), i + "_" + LauncherFiles.DEFAULT_WALLPAPER_THUMBNAIL).delete(); } return writeImageToFileAsJpeg(getDefaultThumbFile(), b); } |