Only show EIS settings when available

(uses the official CameraX API)

Author: MHShetty

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

@@ -4,8 +4,6 @@ import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.content.Context
 import android.content.SharedPreferences
-import android.hardware.camera2.CameraMetadata
-import android.hardware.camera2.CaptureRequest
 import android.net.Uri
 import android.os.Build
 import android.provider.MediaStore
@@ -18,9 +16,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
@@ -218,6 +216,10 @@ class CamConfig(private val mActivity: MainActivity) {
 
     var lastCapturedItem: CapturedItem? = null
 
+    private var frontCameraInfo : CameraInfo? = null
+
+    private var rearCameraInfo : CameraInfo? = null
+
     init {
         if (mActivity !is SecureActivity) {
             CapturedItems.init(mActivity, this)
@@ -429,7 +431,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 +534,10 @@ class CamConfig(private val mActivity: MainActivity) {
         camera!!.cameraInfo.isZslSupported
     }
 
+    fun isStabilizationSupported() : Boolean {
+        return Recorder.getVideoCapabilities(getCurrentCameraInfo()).isStabilizationSupported
+    }
+
     fun shouldShowGyroscope(): Boolean {
         return isInPhotoMode && gSuggestions
     }
@@ -894,6 +900,11 @@ class CamConfig(private val mActivity: MainActivity) {
         startCamera(true)
     }
 
+    private fun getCurrentCameraInfo() : CameraInfo {
+        return if (lensFacing == CameraSelector.LENS_FACING_BACK) rearCameraInfo!!
+        else frontCameraInfo!!
+    }
+
     fun toggleCameraSelector() {
 
         // Manually switch to the opposite lens facing
@@ -937,6 +948,12 @@ class CamConfig(private val mActivity: MainActivity) {
                 return
             }
 
+            // Select a single camera for front/rear facing
+            for (cameraInfo in cameraProvider!!.availableCameraInfos) {
+                if (cameraInfo.lensFacing == CameraSelector.LENS_FACING_FRONT) frontCameraInfo = cameraInfo
+                else if (cameraInfo.lensFacing == CameraSelector.LENS_FACING_BACK) rearCameraInfo = cameraInfo
+            }
+
             // Manually switch to the other lens facing (if the default lens facing isn't
             // supported for the current device)
             if (!isLensFacingSupported(lensFacing)) {
@@ -963,11 +980,11 @@ class CamConfig(private val mActivity: MainActivity) {
     }
 
     private fun isLensFacingSupported(lensFacing : Int) : Boolean {
-        val tCameraSelector = CameraSelector.Builder()
-            .requireLensFacing(lensFacing)
-            .build()
-
-        return cameraProvider?.hasCamera(tCameraSelector) ?: false
+        return when(lensFacing) {
+            CameraSelector.LENS_FACING_FRONT -> frontCameraInfo != null
+            CameraSelector.LENS_FACING_BACK -> rearCameraInfo != null
+            else -> false
+        }
     }
 
     // Start the camera with latest hard configuration
@@ -992,7 +1009,15 @@ class CamConfig(private val mActivity: MainActivity) {
         if (mActivity.isDestroyed || mActivity.isFinishing) return
 
         cameraSelector = CameraSelector.Builder()
-            .requireLensFacing(lensFacing)
+            .addCameraFilter {
+                return@addCameraFilter listOf(
+                    if (lensFacing == CameraSelector.LENS_FACING_BACK) {
+                        rearCameraInfo
+                    } else {
+                        frontCameraInfo
+                    }
+                )
+            }
             .build()
 
         val builder = ImageCapture.Builder()
@@ -1111,7 +1136,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"