diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/CropView.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher3/Folder.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 12 | ||||
| -rw-r--r-- | src/com/android/launcher3/WallpaperCropActivity.java | 29 |
4 files changed, 41 insertions, 5 deletions
diff --git a/src/com/android/launcher3/CropView.java b/src/com/android/launcher3/CropView.java index 9224e3bb2..578b8eafd 100644 --- a/src/com/android/launcher3/CropView.java +++ b/src/com/android/launcher3/CropView.java @@ -165,7 +165,8 @@ public class CropView extends TiledImageView implements OnScaleGestureListener { final float imageWidth = imageDims[0]; final float imageHeight = imageDims[1]; mMinScale = Math.max(w / imageWidth, h / imageHeight); - mRenderer.scale = Math.max(mMinScale, mRenderer.scale); + mRenderer.scale = + Math.max(mMinScale, resetScale ? Float.MIN_VALUE : mRenderer.scale); } } } diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 714c5abd2..051461515 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -763,6 +763,8 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList } completeDragExit(); } + } else { + mLauncher.getWorkspace().removeExtraEmptyScreen(true, null); } mDeleteFolderOnDropCompleted = false; diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index ba334e304..0c14ed93c 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1191,7 +1191,9 @@ public class Launcher extends Activity widgetButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View arg0) { - showAllApps(true, AppsCustomizePagedView.ContentType.Widgets, true); + if (!mWorkspace.isSwitchingState()) { + showAllApps(true, AppsCustomizePagedView.ContentType.Widgets, true); + } } }); widgetButton.setOnTouchListener(getHapticFeedbackTouchListener()); @@ -1200,7 +1202,9 @@ public class Launcher extends Activity wallpaperButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View arg0) { - startWallpaper(); + if (!mWorkspace.isSwitchingState()) { + startWallpaper(); + } } }); wallpaperButton.setOnTouchListener(getHapticFeedbackTouchListener()); @@ -1209,7 +1213,9 @@ public class Launcher extends Activity settingsButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View arg0) { - startSettings(); + if (!mWorkspace.isSwitchingState()) { + startSettings(); + } } }); settingsButton.setOnTouchListener(getHapticFeedbackTouchListener()); diff --git a/src/com/android/launcher3/WallpaperCropActivity.java b/src/com/android/launcher3/WallpaperCropActivity.java index 276aba306..65223ad22 100644 --- a/src/com/android/launcher3/WallpaperCropActivity.java +++ b/src/com/android/launcher3/WallpaperCropActivity.java @@ -550,6 +550,8 @@ public class WallpaperCropActivity extends Activity { Rect roundedTrueCrop = new Rect(); Matrix rotateMatrix = new Matrix(); Matrix inverseRotateMatrix = new Matrix(); + + Point bounds = getImageBounds(); if (mRotation > 0) { rotateMatrix.setRotate(mRotation); inverseRotateMatrix.setRotate(-mRotation); @@ -557,7 +559,6 @@ public class WallpaperCropActivity extends Activity { mCropBounds.roundOut(roundedTrueCrop); mCropBounds = new RectF(roundedTrueCrop); - Point bounds = getImageBounds(); if (bounds == null) { Log.w(LOGTAG, "cannot get bounds for image"); failure = true; @@ -629,12 +630,38 @@ public class WallpaperCropActivity extends Activity { Utils.closeSilently(is); } if (fullSize != null) { + // Find out the true sample size that was used by the decoder + scaleDownSampleSize = bounds.x / fullSize.getWidth(); mCropBounds.left /= scaleDownSampleSize; mCropBounds.top /= scaleDownSampleSize; mCropBounds.bottom /= scaleDownSampleSize; mCropBounds.right /= scaleDownSampleSize; mCropBounds.roundOut(roundedTrueCrop); + // Adjust values to account for issues related to rounding + if (roundedTrueCrop.width() > fullSize.getWidth()) { + // Adjust the width + roundedTrueCrop.right = roundedTrueCrop.left + fullSize.getWidth(); + } + if (roundedTrueCrop.right > fullSize.getWidth()) { + // Adjust the left value + int adjustment = roundedTrueCrop.left - + Math.max(0, roundedTrueCrop.right - roundedTrueCrop.width()); + roundedTrueCrop.left -= adjustment; + roundedTrueCrop.right -= adjustment; + } + if (roundedTrueCrop.height() > fullSize.getHeight()) { + // Adjust the height + roundedTrueCrop.bottom = roundedTrueCrop.top + fullSize.getHeight(); + } + if (roundedTrueCrop.bottom > fullSize.getHeight()) { + // Adjust the top value + int adjustment = roundedTrueCrop.top - + Math.max(0, roundedTrueCrop.bottom - roundedTrueCrop.height()); + roundedTrueCrop.top -= adjustment; + roundedTrueCrop.bottom -= adjustment; + } + crop = Bitmap.createBitmap(fullSize, roundedTrueCrop.left, roundedTrueCrop.top, roundedTrueCrop.width(), roundedTrueCrop.height()); |