diff options
author | Selim Cinek <cinek@google.com> | 2014-03-27 20:03:42 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-27 20:03:42 +0000 |
commit | 08d79b786476146e7dc3fbabea696d7609b94e37 (patch) | |
tree | 84a0d4414b48d1aca3bd6c84d10bcb69dcc1bd63 | |
parent | 68f8cf930a49cdf8db71c612f5bc5a64ff91902b (diff) | |
parent | 314425602a7ccd9cc2bdef1a11f5e51211201b6f (diff) | |
download | android_packages_apps_Trebuchet-08d79b786476146e7dc3fbabea696d7609b94e37.tar.gz android_packages_apps_Trebuchet-08d79b786476146e7dc3fbabea696d7609b94e37.tar.bz2 android_packages_apps_Trebuchet-08d79b786476146e7dc3fbabea696d7609b94e37.zip |
am 31442560: Fixed crash when setting wallpaper with built in rotation
* commit '314425602a7ccd9cc2bdef1a11f5e51211201b6f':
Fixed crash when setting wallpaper with built in rotation
-rw-r--r-- | WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java index 08913b67f..11684c3a0 100644 --- a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java +++ b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java @@ -369,13 +369,6 @@ public class WallpaperCropActivity extends Activity { Point inSize = mCropView.getSourceDimensions(); - // due to rounding errors in the cropview renderer the edges can be slightly offset - // therefore we ensure that the boundaries are sanely defined - cropRect.left = Math.max(0, cropRect.left); - cropRect.right = Math.min(inSize.x, cropRect.right); - cropRect.top = Math.max(0, cropRect.top); - cropRect.bottom = Math.min(inSize.y, cropRect.bottom); - int cropRotation = mCropView.getImageRotation(); float cropScale = mCropView.getWidth() / (float) cropRect.width(); @@ -387,6 +380,14 @@ public class WallpaperCropActivity extends Activity { rotatedInSize[0] = Math.abs(rotatedInSize[0]); rotatedInSize[1] = Math.abs(rotatedInSize[1]); + + // due to rounding errors in the cropview renderer the edges can be slightly offset + // therefore we ensure that the boundaries are sanely defined + cropRect.left = Math.max(0, cropRect.left); + cropRect.right = Math.min(rotatedInSize[0], cropRect.right); + cropRect.top = Math.max(0, cropRect.top); + cropRect.bottom = Math.min(rotatedInSize[1], cropRect.bottom); + // ADJUST CROP WIDTH // Extend the crop all the way to the right, for parallax // (or all the way to the left, in RTL) |