diff options
author | Jay Wang <jaywang@codeaurora.org> | 2014-12-26 18:10:22 -0800 |
---|---|---|
committer | Byunghun Jeon <bjeon@codeaurora.org> | 2015-02-09 20:00:21 -0800 |
commit | 30b2309e7c40a46ea9506344c25b58c9e8ce8dde (patch) | |
tree | fde7703eb9feb2d676b522dfb2bf8c3d0b78b144 /src/com/android/camera/ui/CameraControls.java | |
parent | 5e266938aac08975bbe198915adda22cc59ffebe (diff) | |
download | android_packages_apps_Snap-30b2309e7c40a46ea9506344c25b58c9e8ce8dde.tar.gz android_packages_apps_Snap-30b2309e7c40a46ea9506344c25b58c9e8ce8dde.tar.bz2 android_packages_apps_Snap-30b2309e7c40a46ea9506344c25b58c9e8ce8dde.zip |
SnapdragonCamera: Add FullScreen Preview when in Panoramic shoot
Changed the Panoramic preview to full screen
Resized the warped preview image to smaller Size
and render on top of the full screen preview image
Warped preview image can be turned on/off
Change-Id: I859839542ce94c5f70d7fe7983e93b5e9534b415
Diffstat (limited to 'src/com/android/camera/ui/CameraControls.java')
-rw-r--r-- | src/com/android/camera/ui/CameraControls.java | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index dedf3d583..59222b929 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -20,8 +20,8 @@ import android.animation.Animator; import android.animation.Animator.AnimatorListener; import android.content.Context; import android.graphics.Canvas; +import android.graphics.Color; import android.graphics.drawable.AnimationDrawable; -import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Rect; import android.graphics.Paint; @@ -803,13 +803,17 @@ public class CameraControls extends RotatableLayout { mBottomMargin = bottom; } - public void setPreviewRatio(float ratio) { - int r = CameraUtil.determineRatio(ratio); - mPreviewRatio = r; - if (mPreviewRatio == CameraUtil.RATIO_4_3 && mTopMargin != 0) { - mPaint.setColor(getResources().getColor(R.color.camera_control_bg_opaque)); + public void setPreviewRatio(float ratio, boolean panorama) { + if (panorama) { + mPaint.setColor(Color.TRANSPARENT); } else { - mPaint.setColor(getResources().getColor(R.color.camera_control_bg_transparent)); + int r = CameraUtil.determineRatio(ratio); + mPreviewRatio = r; + if (mPreviewRatio == CameraUtil.RATIO_4_3 && mTopMargin != 0) { + mPaint.setColor(getResources().getColor(R.color.camera_control_bg_opaque)); + } else { + mPaint.setColor(getResources().getColor(R.color.camera_control_bg_transparent)); + } } invalidate(); } |