PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 31442560: Fixed crash when setting wallpaper with built in rotation

Browse Source 
* commit '314425602a7ccd9cc2bdef1a11f5e51211201b6f':
  Fixed crash when setting wallpaper with built in rotation
This commit is contained in:
Selim Cinek
2014-03-27 20:03:42 +00:00
committed by Android Git Automerger
parent 68f8cf930a 314425602a
commit 08d79b7864
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
+8 -7
View File
@@ -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)