diff options
author | Selim Cinek <cinek@google.com> | 2014-03-27 23:10:32 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-27 23:10:32 +0000 |
commit | c3db8011d7f7a5bcb0a9e5ae2d20022c6e88d8f9 (patch) | |
tree | 289fb5e735d565ebfc1348b923786464c5c2e023 /packages/WallpaperCropper | |
parent | 7e90512771943c2b87d96bba8a90e80eb26c65a7 (diff) | |
parent | 58e99f564d552984d5088969a2aa827812db10ac (diff) | |
download | frameworks_base-c3db8011d7f7a5bcb0a9e5ae2d20022c6e88d8f9.zip frameworks_base-c3db8011d7f7a5bcb0a9e5ae2d20022c6e88d8f9.tar.gz frameworks_base-c3db8011d7f7a5bcb0a9e5ae2d20022c6e88d8f9.tar.bz2 |
am 58e99f56: am b6e077dc: am 7718fc12: Fixed crash when setting wallpaper with built in rotation
* commit '58e99f564d552984d5088969a2aa827812db10ac':
Fixed crash when setting wallpaper with built in rotation
Diffstat (limited to 'packages/WallpaperCropper')
-rw-r--r-- | packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java b/packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java index 757a7a2..a070e5e 100644 --- a/packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java +++ b/packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java @@ -348,12 +348,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(); @@ -364,6 +358,13 @@ 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) |