Only show EIS settings when available

(uses the official CameraX API)

Author: MHShetty

app/src/main/java/app/grapheneos/camera/CamConfig.kt

@@ -18,9 +18,9 @@ import android.view.animation.Animation
 import android.view.animation.LinearInterpolator
 import android.widget.Button
 import androidx.annotation.StringRes
-import androidx.camera.camera2.interop.Camera2Interop
 import androidx.camera.core.AspectRatio
 import androidx.camera.core.Camera
+import androidx.camera.core.CameraInfo
 import androidx.camera.core.CameraSelector
 import androidx.camera.core.ImageAnalysis
 import androidx.camera.core.ImageCapture
@@ -429,7 +429,7 @@ class CamConfig(private val mActivity: MainActivity) {
 
     var enableEIS: Boolean
         get() {
-            return mActivity.settingsDialog.enableEISToggle.isChecked
+            return isStabilizationSupported() && mActivity.settingsDialog.enableEISToggle.isChecked
         }
         set(value) {
             val editor = commonPref.edit()
@@ -532,6 +532,10 @@ class CamConfig(private val mActivity: MainActivity) {
         camera!!.cameraInfo.isZslSupported
     }
 
+    fun isStabilizationSupported() : Boolean {
+        return Recorder.getVideoCapabilities(getCurrentConfigCameraInfo()!!).isStabilizationSupported
+    }
+
     fun shouldShowGyroscope(): Boolean {
         return isInPhotoMode && gSuggestions
     }
@@ -894,6 +898,14 @@ class CamConfig(private val mActivity: MainActivity) {
         startCamera(true)
     }
 
+    // Will always return a valid CameraInfo if called within startCamera
+    private fun getCurrentConfigCameraInfo() : CameraInfo? {
+        for (cameraInfo in cameraProvider!!.availableCameraInfos) {
+            if (cameraInfo.lensFacing == lensFacing) return cameraInfo
+        }
+        return null
+    }
+
     fun toggleCameraSelector() {
 
         // Manually switch to the opposite lens facing
@@ -1111,7 +1123,6 @@ class CamConfig(private val mActivity: MainActivity) {
                 ResolutionSelector.Builder().setAspectRatioStrategy(aspectRatioStrategy).build()
             )
 
-        @androidx.camera.camera2.interop.ExperimentalCamera2Interop
         if (isVideoMode) {
             previewBuilder.setPreviewStabilizationEnabled(enableEIS)
         }

app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt

@@ -29,7 +29,6 @@ import android.widget.Spinner
 import android.widget.ToggleButton
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.SwitchCompat
-import androidx.camera.camera2.interop.Camera2CameraInfo
 import androidx.camera.core.AspectRatio
 import androidx.camera.core.CameraSelector
 import androidx.camera.core.DynamicRange
@@ -367,17 +366,11 @@ class SettingsDialog(val mActivity: MainActivity) :
     }
 
     fun showOnlyRelevantSettings() {
-        @androidx.camera.camera2.interop.ExperimentalCamera2Interop
         if (camConfig.isVideoMode) {
             includeAudioSetting.visibility = View.VISIBLE
             enableEISSetting.visibility = View.GONE
-            for (mode in Camera2CameraInfo.from(camConfig.camera!!.cameraInfo)
-                .getCameraCharacteristic(CameraCharacteristics
-                    .CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES)!!){
-                        if (mode == CameraMetadata.CONTROL_VIDEO_STABILIZATION_MODE_ON)
-                            enableEISSetting.visibility = View.VISIBLE
-            }
             videoQualitySetting.visibility = View.VISIBLE
+            if (camConfig.isStabilizationSupported()) enableEISSetting.visibility = View.VISIBLE
         } else {
             includeAudioSetting.visibility = View.GONE
             enableEISSetting.visibility = View.GONE

app/src/main/res/layout/settings.xml

@@ -233,7 +233,8 @@
                         android:layout_height="wrap_content"
                         android:paddingVertical="@dimen/settings_dialog_menu_item_vertical"
                         android:paddingHorizontal="@dimen/settings_dialog_menu_item_horizontal"
-                        android:orientation="horizontal">
+                        android:orientation="horizontal"
+                        android:visibility="gone">
 
                         <TextView
                             android:layout_height="wrap_content"