diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-09-20 02:28:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-20 02:28:39 +0000 |
| commit | f20e184eb58381266f572e9420bf5712358c222e (patch) | |
| tree | ffd96572b2d5c34ab22255dd74b78a2a14c4d325 /src | |
| parent | 8be886da011371e60863b2f4d2cd1dcb1581505a (diff) | |
| parent | 88f33511b8f84521aeb285114b70ccb938d1bf81 (diff) | |
| download | android_packages_apps_Trebuchet-f20e184eb58381266f572e9420bf5712358c222e.tar.gz android_packages_apps_Trebuchet-f20e184eb58381266f572e9420bf5712358c222e.tar.bz2 android_packages_apps_Trebuchet-f20e184eb58381266f572e9420bf5712358c222e.zip | |
Merge "Fix default wallpaper dimensions" into jb-ub-now-indigo-rose
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/WallpaperCropActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/WallpaperCropActivity.java b/src/com/android/launcher3/WallpaperCropActivity.java index f5a6b80b3..f35948058 100644 --- a/src/com/android/launcher3/WallpaperCropActivity.java +++ b/src/com/android/launcher3/WallpaperCropActivity.java @@ -138,12 +138,13 @@ public class WallpaperCropActivity extends Activity { windowManager.getDefaultDisplay().getCurrentSizeRange(minDims, maxDims); int maxDim = Math.max(maxDims.x, maxDims.y); - final int minDim = Math.min(minDims.x, minDims.y); + int minDim = Math.max(minDims.x, minDims.y); if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) { Point realSize = new Point(); windowManager.getDefaultDisplay().getRealSize(realSize); maxDim = Math.max(realSize.x, realSize.y); + minDim = Math.min(realSize.x, realSize.y); } // We need to ensure that there is enough extra space in the wallpaper |