diff options
| -rw-r--r-- | src/com/android/camera/ui/ZoomRenderer.java | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/ZoomRenderer.java b/src/com/android/camera/ui/ZoomRenderer.java index 3e436cff8..27e353c0f 100644 --- a/src/com/android/camera/ui/ZoomRenderer.java +++ b/src/com/android/camera/ui/ZoomRenderer.java @@ -16,11 +16,13 @@ package com.android.camera.ui; +import android.app.Activity; import android.content.Context; import android.content.res.Resources; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; +import android.graphics.Point; import android.graphics.Rect; import android.os.Handler; import android.view.ScaleGestureDetector; @@ -57,6 +59,10 @@ public class ZoomRenderer extends OverlayRenderer private float mZoomMinValue; private float mZoomMaxValue; + private Point mDispSize; + private int mBottomMargin; + private int mTopMargin; + public interface OnZoomChangedListener { void onZoomStart(); void onZoomEnd(); @@ -81,6 +87,13 @@ public class ZoomRenderer extends OverlayRenderer mMinCircle = res.getDimensionPixelSize(R.dimen.zoom_ring_min); mTextBounds = new Rect(); setVisible(false); + mBottomMargin = + ctx.getResources().getDimensionPixelSize(R.dimen.preview_bottom_margin); + mTopMargin = + ctx.getResources().getDimensionPixelSize(R.dimen.preview_top_margin); + mDispSize = new Point(); + Activity activity = (Activity) ctx; + activity.getWindowManager().getDefaultDisplay().getRealSize(mDispSize); } // set from module @@ -119,9 +132,13 @@ public class ZoomRenderer extends OverlayRenderer @Override public void layout(int l, int t, int r, int b) { + l = 0; + t = mTopMargin; + r = mDispSize.x; + b = mDispSize.y - mBottomMargin; super.layout(l, t, r, b); mCenterX = (r - l) / 2; - mCenterY = (b - t) / 2; + mCenterY = ((b - t) / 2) + t; mMaxCircle = Math.min(getWidth(), getHeight()); mMaxCircle = (mMaxCircle - mMinCircle) / 2; } |