summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoUI.java
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-05-17 13:18:19 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-05-17 13:18:19 -0700
commit2f55e41ebe1e7eb376b44738800b4e1f4b12453c (patch)
treeb5e53eb51d4aef1df0a32ac031f502117e452be5 /src/com/android/camera/PhotoUI.java
parent23f0ed3d718cae1a3cb31c2e454c39056937866b (diff)
parent1f8e3a0b876e0d578fb3547079f13c937df7a6e5 (diff)
downloadandroid_packages_apps_Snap-2f55e41ebe1e7eb376b44738800b4e1f4b12453c.tar.gz
android_packages_apps_Snap-2f55e41ebe1e7eb376b44738800b4e1f4b12453c.tar.bz2
android_packages_apps_Snap-2f55e41ebe1e7eb376b44738800b4e1f4b12453c.zip
Merge "SnapdragonCamera: Fix for layout stretching issue." 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.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index d91f23c31..250f265b2 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -156,6 +156,7 @@ public class PhotoUI implements PieListener,
private int mScreenRatio = CameraUtil.RATIO_UNKNOWN;
private int mTopMargin = 0;
private int mBottomMargin = 0;
+ private boolean mIsLayoutInitializedAlready = false;
private int mOrientation;
private float mScreenBrightness = 0.0f;
@@ -260,7 +261,7 @@ public class PhotoUI implements PieListener,
}
if (mOrientationResize != mPrevOrientationResize
- || mAspectRatioResize) {
+ || mAspectRatioResize || !mIsLayoutInitializedAlready) {
layoutPreview(mAspectRatio);
mAspectRatioResize = false;
}
@@ -461,6 +462,7 @@ public class PhotoUI implements PieListener,
if (mFaceView != null) {
mFaceView.setLayoutParams(lp);
}
+ mIsLayoutInitializedAlready = true;
}
public void setSurfaceTextureSizeChangedListener(SurfaceTextureSizeChangedListener listener) {