drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8ae8689d: am c41853ce: Fixed wallpaper bug where wrong size was taken when cropping

Browse Source 
* commit '8ae8689d165299bd0bbd0e04bff987dad352c8f5':
  Fixed wallpaper bug where wrong size was taken when cropping
This commit is contained in:
Selim Cinek
2014-03-25 03:46:27 +00:00
committed by Android Git Automerger
parent 8ee4491dc8 8ae8689d16
commit 7290b56b51
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java
View File

@ -346,16 +346,17 @@ public class WallpaperCropActivity extends Activity {
// Get the crop // Get the crop
RectF cropRect = mCropView.getCrop(); RectF cropRect = mCropView.getCrop();
Point inSize = mCropView.getSourceDimensions();
// Due to rounding errors in the cropview renderer the edges can be slightly offset // Due to rounding errors in the cropview renderer the edges can be slightly offset
// therefore we ensure that the boundaries are sanely defined // therefore we ensure that the boundaries are sanely defined
cropRect.left = Math.max(0, cropRect.left); cropRect.left = Math.max(0, cropRect.left);
cropRect.right = Math.min(mCropView.getWidth(), cropRect.right); cropRect.right = Math.min(inSize.x, cropRect.right);
cropRect.top = Math.max(0, cropRect.top); cropRect.top = Math.max(0, cropRect.top);
cropRect.bottom = Math.min(mCropView.getHeight(), cropRect.bottom); cropRect.bottom = Math.min(inSize.y, cropRect.bottom);
int cropRotation = mCropView.getImageRotation(); int cropRotation = mCropView.getImageRotation();
float cropScale = mCropView.getWidth() / (float) cropRect.width(); float cropScale = mCropView.getWidth() / (float) cropRect.width();
Point inSize = mCropView.getSourceDimensions();
Matrix rotateMatrix = new Matrix(); Matrix rotateMatrix = new Matrix();
rotateMatrix.setRotate(cropRotation); rotateMatrix.setRotate(cropRotation);
float[] rotatedInSize = new float[] { inSize.x, inSize.y }; float[] rotatedInSize = new float[] { inSize.x, inSize.y };