diff options
author | Adam Cohen <adamcohen@google.com> | 2014-05-21 15:03:34 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2014-05-21 17:13:40 -0700 |
commit | ea90f83e248086b91dbbc7969059f6887190b2a2 (patch) | |
tree | 09c219e33ea8b995857ecf5c985bdfda602072e1 /WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java | |
parent | 73859adf80c94a377508a1d9ea8b6fa45a19f80f (diff) | |
download | android_packages_apps_Trebuchet-ea90f83e248086b91dbbc7969059f6887190b2a2.tar.gz android_packages_apps_Trebuchet-ea90f83e248086b91dbbc7969059f6887190b2a2.tar.bz2 android_packages_apps_Trebuchet-ea90f83e248086b91dbbc7969059f6887190b2a2.zip |
Check before suggesting default wallpaper dimensions
issue 14470153
Change-Id: Id00e9cb4bd2b769818ed61de65be8c1c0119e07d
Diffstat (limited to 'WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java')
-rw-r--r-- | WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java index 11684c3a0..6c58da0a8 100644 --- a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java +++ b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java @@ -824,17 +824,28 @@ public class WallpaperCropActivity extends Activity { editor.commit(); suggestWallpaperDimension(getResources(), - sp, getWindowManager(), WallpaperManager.getInstance(this)); + sp, getWindowManager(), WallpaperManager.getInstance(this), true); } static public void suggestWallpaperDimension(Resources res, final SharedPreferences sharedPrefs, WindowManager windowManager, - final WallpaperManager wallpaperManager) { + final WallpaperManager wallpaperManager, boolean fallBackToDefaults) { final Point defaultWallpaperSize = getDefaultWallpaperSize(res, windowManager); // If we have saved a wallpaper width/height, use that instead - int savedWidth = sharedPrefs.getInt(WALLPAPER_WIDTH_KEY, defaultWallpaperSize.x); - int savedHeight = sharedPrefs.getInt(WALLPAPER_HEIGHT_KEY, defaultWallpaperSize.y); + + int savedWidth = sharedPrefs.getInt(WALLPAPER_WIDTH_KEY, -1); + int savedHeight = sharedPrefs.getInt(WALLPAPER_HEIGHT_KEY, -1); + + if (savedWidth == -1 || savedHeight == -1) { + if (!fallBackToDefaults) { + return; + } else { + savedWidth = defaultWallpaperSize.x; + savedHeight = defaultWallpaperSize.y; + } + } + if (savedWidth != wallpaperManager.getDesiredMinimumWidth() || savedHeight != wallpaperManager.getDesiredMinimumHeight()) { wallpaperManager.suggestDesiredDimensions(savedWidth, savedHeight); |