summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2016-09-21 08:09:52 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-21 08:09:52 -0700
commitf9a23da1598e7cc2165d278bbac11f3c49e41c34 (patch)
tree28bc666bff2bf96c98d559c81efbe7ef1a20ec31
parentbbcb7af8695ddf3a0d3cad0c2888891647b11029 (diff)
parentf45ab38a2548654c1ce3a3f366e7c068f10463e2 (diff)
downloadandroid_packages_apps_Snap-f9a23da1598e7cc2165d278bbac11f3c49e41c34.tar.gz
android_packages_apps_Snap-f9a23da1598e7cc2165d278bbac11f3c49e41c34.tar.bz2
android_packages_apps_Snap-f9a23da1598e7cc2165d278bbac11f3c49e41c34.zip
Merge "SnapdragonCamera:Fix can't take picture" into camera.lnx.1.0-dev.1.0
-rw-r--r--src/com/android/camera/PhotoModule.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index c16bfe76b..0d0161bc6 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2665,6 +2665,12 @@ public class PhotoModule
// we will update focus manager with proper UI.
if (mFocusManager != null && mUI != null) {
mFocusManager.setPhotoUI(mUI);
+
+ View root = mUI.getRootView();
+ // These depend on camera parameters.
+ int width = root.getWidth();
+ int height = root.getHeight();
+ mFocusManager.setPreviewSize(width, height);
}
}