diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2016-04-26 12:37:28 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-04-26 12:37:28 -0700 |
commit | 2d64c767c9848ba31b34c6672d42db0125da67a6 (patch) | |
tree | fc4f3036a0c8fe2b42d56ee052ce7875849f64a7 /src/com/android/camera/PhotoUI.java | |
parent | 26068da0b1b0e4073f4afb9645c37ba6bfc84bf4 (diff) | |
parent | 342f48c556dbf0ca67aee89f6d34c1a29152b654 (diff) | |
download | android_packages_apps_Snap-2d64c767c9848ba31b34c6672d42db0125da67a6.tar.gz android_packages_apps_Snap-2d64c767c9848ba31b34c6672d42db0125da67a6.tar.bz2 android_packages_apps_Snap-2d64c767c9848ba31b34c6672d42db0125da67a6.zip |
Merge "SnapdragonCamera: Removing unnecessary orientation check" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
-rw-r--r-- | src/com/android/camera/PhotoUI.java | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index d4503af77..c8e01fea0 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -259,21 +259,6 @@ public class PhotoUI implements PieListener, mMaxPreviewHeight = height; } - int orientation = mActivity.getResources().getConfiguration().orientation; - if ((orientation == Configuration.ORIENTATION_PORTRAIT && width > height) - || (orientation == Configuration.ORIENTATION_LANDSCAPE && width < height)) { - // The screen has rotated; swap SurfaceView width & height - // to ensure correct preview - int oldWidth = width; - width = height; - height = oldWidth; - Log.d(TAG, "Swapping SurfaceView width & height dimensions"); - if (mMaxPreviewWidth != 0 && mMaxPreviewHeight != 0) { - int temp = mMaxPreviewWidth; - mMaxPreviewWidth = mMaxPreviewHeight; - mMaxPreviewHeight = temp; - } - } if (mOrientationResize != mPrevOrientationResize || mAspectRatioResize) { layoutPreview(mAspectRatio); |