summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Chen <intervigil@gmail.com>2018-03-16 23:57:14 -0700
committerBruno Martins <bgcngm@gmail.com>2018-11-20 12:32:17 +0000
commitd76d0a0bac483fe91942787ccde6b78c983f037b (patch)
treedfd0b83f5bef4174a22cc683545950f306ac9717
parent835fe7f63e6781c26fb90876296f4073d274d456 (diff)
downloadandroid_packages_apps_Snap-d76d0a0bac483fe91942787ccde6b78c983f037b.tar.gz
android_packages_apps_Snap-d76d0a0bac483fe91942787ccde6b78c983f037b.tar.bz2
android_packages_apps_Snap-d76d0a0bac483fe91942787ccde6b78c983f037b.zip
Snap: Configure focus ring preview dimensions
Change-Id: I49d7f28fb2f731e18c73b9d944882f9f8a4fb5c2
-rw-r--r--src/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 2d22275bf..287890cbd 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -180,6 +180,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 65a4385b4..e1cf6ba76 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2828,7 +2828,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);
}
}
}