Fix a bug that RotateImage didn't draw the thumbnail in the center.

Change-Id: Ia46c5ecbceebd5062c76b9396f39a17ae6bc1ed2

2 files changed, 5 insertions, 7 deletions

diff --git a/src/com/android/camera/RotateImageView.java b/src/com/android/camera/RotateImageView.java
index 74152d4..14d1628 100644
--- a/src/com/android/camera/RotateImageView.java
+++ b/src/com/android/camera/RotateImageView.java
@@ -97,6 +97,7 @@ public class RotateImageView extends ImageView {
         }
 
         int saveCount = canvas.getSaveCount();
+        canvas.translate(getPaddingLeft(), getPaddingTop());
         canvas.rotate(-mCurrentDegree, w / 2, h / 2);
         drawable.draw(canvas);
         canvas.restoreToCount(saveCount);
diff --git a/src/com/android/camera/ThumbnailController.java b/src/com/android/camera/ThumbnailController.java
index 3bc0e8c..cd76276 100644
--- a/src/com/android/camera/ThumbnailController.java
+++ b/src/com/android/camera/ThumbnailController.java
@@ -152,14 +152,11 @@ public class ThumbnailController {
             return;
         }
 
-        // Make the mini-thumb size smaller than the button size so that the
-        // image corners don't peek out from the rounded corners of the
-        // frame_thumb graphic:
-        final int PADDING_WIDTH = 2;
-        final int PADDING_HEIGHT = 2;
         LayoutParams param = mButton.getLayoutParams();
-        final int miniThumbWidth = param.width - 2 * PADDING_WIDTH;
-        final int miniThumbHeight = param.height - 2 * PADDING_HEIGHT;
+        final int miniThumbWidth = param.width
+                - mButton.getPaddingLeft() - mButton.getPaddingRight();
+        final int miniThumbHeight = param.height
+                - mButton.getPaddingTop() - mButton.getPaddingBottom();
         mThumb = ThumbnailUtil.extractMiniThumb(
                 original, miniThumbWidth, miniThumbHeight,
                 ThumbnailUtil.NO_RECYCLE_INPUT);