summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Chen <intervigil@gmail.com>2018-03-16 23:57:14 -0700
committerEthan Chen <intervigil@gmail.com>2018-03-16 23:58:01 -0700
commit9b0c005c1f4accac1cf37362fd8cef00162139a1 (patch)
tree5da7e6a6b1f32805537d0a6d7725dd812f840a47
parentb2ef15eda138bab58bbded7c9831e5599d4c835c (diff)
downloadandroid_packages_apps_Snap-9b0c005c1f4accac1cf37362fd8cef00162139a1.zip
android_packages_apps_Snap-9b0c005c1f4accac1cf37362fd8cef00162139a1.tar.gz
android_packages_apps_Snap-9b0c005c1f4accac1cf37362fd8cef00162139a1.tar.bz2
Snap: Configure focus ring preview dimensions
Change-Id: I49d7f28fb2f731e18c73b9d944882f9f8a4fb5c2
-rwxr-xr-xsrc/com/android/camera/FocusOverlayManager.java1
-rw-r--r--src/com/android/camera/PhotoModule.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index 6c6769e..37c5d09 100755
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -186,6 +186,7 @@ public class FocusOverlayManager {
public void setPreviewRect(Rect previewRect) {
if (!mPreviewRect.equals(previewRect)) {
mPreviewRect.set(previewRect);
+ mFocusRing.configurePreviewDimensions(CameraUtil.rectToRectF(mPreviewRect));
resetCoordinateTransformer();
mInitialized = true;
}
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 609b54a..8c6a86f 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2978,7 +2978,7 @@ public class PhotoModule
if (mFocusManager == null) {
mFocusManager = new FocusOverlayManager(mPreferences, defaultFocusModes,
mInitialParams, this, mMirror,
- mActivity.getMainLooper(), mUI != null ? mUI.getFocusRing() : null, mActivity);
+ mActivity.getMainLooper(), mUI.getFocusRing(), mActivity);
}
}
}