summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Chen <intervigil@gmail.com>2018-03-16 23:57:14 -0700
committerMichael Bestas <mkbestas@lineageos.org>2019-11-09 22:15:24 +0200
commit4ae205146682f417cd3b537862dcd92ab714db50 (patch)
tree3a508d28de202cf4aeba65b4da5397bcac2d250b
parent2474fc7e85dd07958cfe0a7db928cfe110815b07 (diff)
downloadandroid_packages_apps_Snap-4ae205146682f417cd3b537862dcd92ab714db50.zip
android_packages_apps_Snap-4ae205146682f417cd3b537862dcd92ab714db50.tar.gz
android_packages_apps_Snap-4ae205146682f417cd3b537862dcd92ab714db50.tar.bz2
Snap: Configure focus ring preview dimensions
Change-Id: I49d7f28fb2f731e18c73b9d944882f9f8a4fb5c2
-rw-r--r--src/com/android/camera/FocusOverlayManager.java1
-rwxr-xr-xsrc/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 2d22275..287890c 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 aae6279..97b57c2 100755
--- 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);
}
}
}