diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-11-21 16:57:02 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-11-22 01:24:28 -0800 |
| commit | e8e541a684fddea0cdbd3f4e148e9d3193f120eb (patch) | |
| tree | 4667f2c33d2627bd0513e323e1cda153bcc0c440 /src/com/android/camera/ui/CameraControls.java | |
| parent | 272f70b628bb615cba2e7e8fd4eb9b2fd6389d4b (diff) | |
| download | android_packages_apps_Snap-e8e541a684fddea0cdbd3f4e148e9d3193f120eb.tar.gz android_packages_apps_Snap-e8e541a684fddea0cdbd3f4e148e9d3193f120eb.tar.bz2 android_packages_apps_Snap-e8e541a684fddea0cdbd3f4e148e9d3193f120eb.zip | |
snap: Panorama fixes
* Fix animations and transitions
* Disable warped preview overlay, this looks terrible and needs
rewritten.
Change-Id: I9474219c57fc204dd16797aa8921296e61cc9d37
Diffstat (limited to 'src/com/android/camera/ui/CameraControls.java')
| -rw-r--r-- | src/com/android/camera/ui/CameraControls.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index 66bf4e010..1436390d3 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -461,7 +461,11 @@ public class CameraControls extends RotatableLayout { public void setPreviewRect(RectF rectL) { int r = CameraUtil.determineRatio(Math.round(rectL.width()), Math.round(rectL.height())); mPreviewRatio = r; - if (mPreviewRatio == CameraUtil.RATIO_4_3 && mTopMargin != 0) { + + boolean pano = ((CameraActivity) getContext()).getCurrentModuleIndex() == + ModuleSwitcher.WIDE_ANGLE_PANO_MODULE_INDEX; + + if (pano || (mPreviewRatio == CameraUtil.RATIO_4_3 && mTopMargin != 0)) { mBottomBar.setBackgroundResource(R.drawable.camera_controls_bg_opaque); } else { mBottomBar.setBackgroundResource(R.drawable.camera_controls_bg_translucent); |