fix: make focus slider first in the preview dialog, harder to miss

feelfreelinux · Jul 14, 2024 · 87637d4 · 87637d4
1 parent ed15936
commit 87637d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/app/app/src/main/java/com/octo4a/camera/CameraService.kt b/app/app/src/main/java/com/octo4a/camera/CameraService.kt
@@ -402,6 +402,8 @@ class CameraService : LifecycleService(), MJpegFrameProvider {
       if (_cameraSettings.manualAF) {
         ext.setCaptureRequestOption(
           CaptureRequest.CONTROL_AF_MODE, CameraMetadata.CONTROL_AF_MODE_OFF)
+        ext.setCaptureRequestOption(
+          CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_CANCEL)
         ext.setCaptureRequestOption(
           CaptureRequest.LENS_FOCUS_DISTANCE, _cameraSettings.manualAFValue)
       }

diff --git a/app/app/src/main/res/layout/dialog_camera_preview.xml b/app/app/src/main/res/layout/dialog_camera_preview.xml
@@ -14,6 +14,11 @@
             app:implementationMode="compatible"
             android:layout_height="280dp"
             android:id="@+id/previewView"/>
+    <com.google.android.material.slider.Slider
+        android:layout_marginHorizontal="8dp"
+        android:id="@+id/manualFocusSlider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
     <LinearLayout
         android:layout_width="match_parent"
         android:orientation="horizontal"
@@ -30,9 +35,4 @@
             android:text="@string/camera_preview_manual_af">
         </TextView>
     </LinearLayout>
-    <com.google.android.material.slider.Slider
-        android:layout_marginHorizontal="8dp"
-        android:id="@+id/manualFocusSlider"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
 </LinearLayout>