diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-09-19 19:36:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-19 19:36:16 -0700 |
| commit | 48c52bea8b8b53e9e7d5e0db409a0ada8bd90d0d (patch) | |
| tree | 612541b729910491553ab1df80bebcf1d5c5deb3 /packages | |
| parent | 2e6eef655f079536251ff030d38fb6480dd97a18 (diff) | |
| parent | bdac73fec8e6d4686398654f7a74db465e6de8e0 (diff) | |
| download | frameworks_base-48c52bea8b8b53e9e7d5e0db409a0ada8bd90d0d.zip frameworks_base-48c52bea8b8b53e9e7d5e0db409a0ada8bd90d0d.tar.gz frameworks_base-48c52bea8b8b53e9e7d5e0db409a0ada8bd90d0d.tar.bz2 | |
am bdac73fe: Merge "Fix default wallpaper dimensions" into klp-dev
* commit 'bdac73fec8e6d4686398654f7a74db465e6de8e0':
Fix default wallpaper dimensions
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java b/packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java index a993ed3..af48652 100644 --- a/packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java +++ b/packages/WallpaperCropper/src/com/android/wallpapercropper/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 |