diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-26 17:36:10 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-26 17:36:10 -0700 |
| commit | b10b4edda7a132a729db8706c33615328407a747 (patch) | |
| tree | bb20eeb80c9f81bf8df59c8a1ce226726b97cff9 /src/com/android/camera/VideoUI.java | |
| parent | d8d0264b44734ac425a67a616bb69f453bffb54d (diff) | |
| parent | df23d71189d514eecf8e358f135823e5f540abb9 (diff) | |
| download | android_packages_apps_Snap-b10b4edda7a132a729db8706c33615328407a747.tar.gz android_packages_apps_Snap-b10b4edda7a132a729db8706c33615328407a747.tar.bz2 android_packages_apps_Snap-b10b4edda7a132a729db8706c33615328407a747.zip | |
Merge "SnapdragonCamera:Fix Face circles are drawn at an offset" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/VideoUI.java')
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index c4ff511bf..2ecf9e140 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -402,6 +402,7 @@ public class VideoUI implements PieRenderer.PieListener, float scaledTextureWidth, scaledTextureHeight; int rotation = CameraUtil.getDisplayRotation(mActivity); + mScreenRatio = CameraUtil.determineRatio(ratio); if (mScreenRatio == CameraUtil.RATIO_16_9 && CameraUtil.determinCloseRatio(ratio) == CameraUtil.RATIO_4_3) { int l = (mTopMargin + mBottomMargin) * 4; @@ -434,6 +435,9 @@ public class VideoUI implements PieRenderer.PieListener, } } else { float width = mMaxPreviewWidth, height = mMaxPreviewHeight; + if (width == 0 || height == 0) return; + if(mScreenRatio == CameraUtil.RATIO_4_3) + height -= (mTopMargin + mBottomMargin); if (mOrientationResize) { scaledTextureWidth = height * mAspectRatio; if (scaledTextureWidth > width) { @@ -1255,9 +1259,6 @@ public class VideoUI implements PieRenderer.PieListener, mFaceView.setVisibility(View.VISIBLE); mFaceView.setDisplayOrientation(orientation); mFaceView.setMirror(mirror); - LayoutParams layoutParams = new LayoutParams( - LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); - mFaceView.setLayoutParams(layoutParams); mFaceView.resume(); } |