am c3db8011: am 58e99f56: am b6e077dc: am 7718fc12: Fixed crash when setting... (49fb8aef) · Commits · e / os / android_frameworks_base

packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -365,12 +365,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();

		@@ -381,6 +375,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)