diff options
author | Michael Jurka <mikejurka@google.com> | 2014-01-14 13:50:53 +0100 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2014-01-14 13:50:53 +0100 |
commit | 4808aa6b42ff31aa792b6dc0601bd6f24a554e21 (patch) | |
tree | db3434fc54ae562bf781034bda0e2d5d893d4a2a /WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java | |
parent | fe45a82ed90bd9e8d949c210d905fcf38e64aaf2 (diff) | |
download | android_packages_apps_Trebuchet-4808aa6b42ff31aa792b6dc0601bd6f24a554e21.tar.gz android_packages_apps_Trebuchet-4808aa6b42ff31aa792b6dc0601bd6f24a554e21.tar.bz2 android_packages_apps_Trebuchet-4808aa6b42ff31aa792b6dc0601bd6f24a554e21.zip |
Add ability to center the crop (disabled)
Diffstat (limited to 'WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java')
-rw-r--r-- | WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java index b3ef07309..ee7b81951 100644 --- a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java +++ b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java @@ -330,10 +330,10 @@ public class WallpaperCropActivity extends Activity { protected void cropImageAndSetWallpaper(Uri uri, OnBitmapCroppedHandler onBitmapCroppedHandler, final boolean finishActivityWhenDone) { + boolean centerCrop = getResources().getBoolean(R.bool.center_crop); // Get the crop boolean ltr = mCropView.getLayoutDirection() == View.LAYOUT_DIRECTION_LTR; - Display d = getWindowManager().getDefaultDisplay(); Point displaySize = new Point(); @@ -358,15 +358,25 @@ public class WallpaperCropActivity extends Activity { // ADJUST CROP WIDTH // Extend the crop all the way to the right, for parallax // (or all the way to the left, in RTL) - float extraSpace = ltr ? rotatedInSize[0] - cropRect.right : cropRect.left; + float extraSpace; + if (centerCrop) { + extraSpace = 2f * Math.min(rotatedInSize[0] - cropRect.right, cropRect.left); + } else { + extraSpace = ltr ? rotatedInSize[0] - cropRect.right : cropRect.left; + } // Cap the amount of extra width float maxExtraSpace = defaultWallpaperSize.x / cropScale - cropRect.width(); extraSpace = Math.min(extraSpace, maxExtraSpace); - if (ltr) { - cropRect.right += extraSpace; + if (centerCrop) { + cropRect.left -= extraSpace / 2f; + cropRect.right += extraSpace / 2f; } else { - cropRect.left -= extraSpace; + if (ltr) { + cropRect.right += extraSpace; + } else { + cropRect.left -= extraSpace; + } } // ADJUST CROP HEIGHT |