From 51e56f235d0febf81022e8f121e3db82bbc05c8b Mon Sep 17 00:00:00 2001 From: Pun Butrach Date: Sat, 23 May 2026 00:08:32 +0700 Subject: [PATCH] feat: Smartspace Torch Provider (#6742) * feat: Smartspace Torch Signed-off-by: Pun Butrach * chore: Add flashlight permission Signed-off-by: Pun Butrach * feat: Turn off *all* camera torches Signed-off-by: Pun Butrach * chore: Logs Signed-off-by: Pun Butrach * chore: Spotlessified Signed-off-by: Pun Butrach * refactor: Use SmartspaceAction.onClick instead of receiver Signed-off-by: Pun Butrach * refactor: Apply suggestions from reviewer Signed-off-by: Pun Butrach --------- Signed-off-by: Pun Butrach --- lawnchair/AndroidManifest.xml | 1 + lawnchair/res/drawable/ic_flashlight_off.xml | 20 +++ lawnchair/res/values/strings.xml | 5 + .../preferences2/PreferenceManager2.kt | 5 + .../smartspace/model/SmartspaceScores.kt | 1 + .../smartspace/provider/SmartspaceProvider.kt | 1 + .../smartspace/provider/TorchProvider.kt | 119 ++++++++++++++++++ 7 files changed, 152 insertions(+) create mode 100644 lawnchair/res/drawable/ic_flashlight_off.xml create mode 100644 lawnchair/src/app/lawnchair/smartspace/provider/TorchProvider.kt diff --git a/lawnchair/AndroidManifest.xml b/lawnchair/AndroidManifest.xml index 757d7818e1..093d5a187a 100644 --- a/lawnchair/AndroidManifest.xml +++ b/lawnchair/AndroidManifest.xml @@ -38,6 +38,7 @@ + diff --git a/lawnchair/res/drawable/ic_flashlight_off.xml b/lawnchair/res/drawable/ic_flashlight_off.xml new file mode 100644 index 0000000000..b66bad2e2a --- /dev/null +++ b/lawnchair/res/drawable/ic_flashlight_off.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/lawnchair/res/values/strings.xml b/lawnchair/res/values/strings.xml index b8778a49eb..539fdbab4f 100644 --- a/lawnchair/res/values/strings.xml +++ b/lawnchair/res/values/strings.xml @@ -479,9 +479,14 @@ Weather Battery status + Flashlight status Now Playing Onboarding + + Flashlight on + Tap to turn off + Configure your Lawnchair Long-press on the Home Screen to open Settings diff --git a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt index 620e6f6a63..0bb250b48c 100644 --- a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt +++ b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt @@ -682,6 +682,11 @@ class PreferenceManager2 @Inject constructor( defaultValue = true, ) + val smartspaceTorch = preference( + key = booleanPreferencesKey("enable_smartspace_torch"), + defaultValue = true, + ) + val smartspaceNowPlaying = preference( key = booleanPreferencesKey("enable_smartspace_now_playing"), defaultValue = true, diff --git a/lawnchair/src/app/lawnchair/smartspace/model/SmartspaceScores.kt b/lawnchair/src/app/lawnchair/smartspace/model/SmartspaceScores.kt index fe51d74de0..76ba63a0c0 100644 --- a/lawnchair/src/app/lawnchair/smartspace/model/SmartspaceScores.kt +++ b/lawnchair/src/app/lawnchair/smartspace/model/SmartspaceScores.kt @@ -6,5 +6,6 @@ object SmartspaceScores { const val SCORE_MEDIA = 2f const val SCORE_CALENDAR = 3f const val SCORE_LOW_BATTERY = 10f + const val SCORE_FLASHLIGHT = 11f const val SCORE_ONBOARDING = 1000f } diff --git a/lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceProvider.kt b/lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceProvider.kt index ec67dc3ab4..8dd6b6af85 100644 --- a/lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceProvider.kt +++ b/lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceProvider.kt @@ -28,6 +28,7 @@ class SmartspaceProvider @Inject constructor( val dataSources = listOf( SmartspaceWidgetReader(context), BatteryStatusProvider(context), + TorchProvider(context), NowPlayingProvider(context), OnboardingProvider(context), ) diff --git a/lawnchair/src/app/lawnchair/smartspace/provider/TorchProvider.kt b/lawnchair/src/app/lawnchair/smartspace/provider/TorchProvider.kt new file mode 100644 index 0000000000..e6642a6aa4 --- /dev/null +++ b/lawnchair/src/app/lawnchair/smartspace/provider/TorchProvider.kt @@ -0,0 +1,119 @@ +package app.lawnchair.smartspace.provider + +import android.content.Context +import android.graphics.drawable.Icon +import android.hardware.camera2.CameraAccessException +import android.hardware.camera2.CameraCharacteristics +import android.hardware.camera2.CameraManager +import android.os.Handler +import android.os.Looper +import android.util.Log +import androidx.core.content.getSystemService +import app.lawnchair.smartspace.model.SmartspaceAction +import app.lawnchair.smartspace.model.SmartspaceScores +import app.lawnchair.smartspace.model.SmartspaceTarget +import com.android.launcher3.R +import kotlinx.coroutines.channels.awaitClose +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.callbackFlow +import kotlinx.coroutines.flow.map + +class TorchProvider(context: Context) : + SmartspaceDataSource( + context, + R.string.smartspace_torch, + { smartspaceTorch }, + ) { + private val cameraManager = context.getSystemService() + + override val internalTargets = torchFlow() + .map { enabled -> listOfNotNull(if (enabled) getSmartspaceTarget() else null) } + + private fun torchFlow(): Flow = callbackFlow { + if (cameraManager == null) { + trySend(false) + close() + return@callbackFlow + } + + // Collect all flash-capable camera IDs + val flashCameraIds = cameraManager.cameraIdList + .filter { id -> + cameraManager.getCameraCharacteristics(id) + .get(CameraCharacteristics.FLASH_INFO_AVAILABLE) == true + } + .toSet() + + if (flashCameraIds.isEmpty()) { + trySend(false) + close() + return@callbackFlow + } + + val enabledCameraIds = mutableSetOf() + + val callback = object : CameraManager.TorchCallback() { + override fun onTorchModeChanged(id: String, enabled: Boolean) { + if (id in flashCameraIds) { + if (enabled) { + enabledCameraIds.add(id) + } else { + enabledCameraIds.remove(id) + } + trySend(enabledCameraIds.intersect(flashCameraIds).isNotEmpty()) + } + } + + override fun onTorchModeUnavailable(id: String) { + if (id in flashCameraIds) { + enabledCameraIds.remove(id) + trySend(enabledCameraIds.intersect(flashCameraIds).isNotEmpty()) + } + } + } + + cameraManager.registerTorchCallback(callback, Handler(Looper.getMainLooper())) + awaitClose { cameraManager.unregisterTorchCallback(callback) } + } + + private fun getSmartspaceTarget(): SmartspaceTarget { + return SmartspaceTarget( + id = "torchStatus", + headerAction = SmartspaceAction( + id = "torchStatusAction", + icon = Icon.createWithResource(context, R.drawable.ic_flashlight_off), + title = context.getString(R.string.torch_status_on), + subtitle = context.getString(R.string.torch_action_off), + onClick = Runnable { + val cameraManager = cameraManager ?: return@Runnable + try { + cameraManager.cameraIdList.forEach { cameraId -> + try { + val hasFlash = cameraManager + .getCameraCharacteristics(cameraId) + .get(CameraCharacteristics.FLASH_INFO_AVAILABLE) == true + if (hasFlash) { + cameraManager.setTorchMode(cameraId, false) + } + } catch (e: CameraAccessException) { + Log.e( + TAG, + "Failed to turn off torch for camera $cameraId: ${e.message}", + e, + ) + } + } + } catch (e: CameraAccessException) { + Log.e(TAG, "Failed to access camera list", e) + } + }, + ), + score = SmartspaceScores.SCORE_FLASHLIGHT, + featureType = SmartspaceTarget.FeatureType.FEATURE_FLASHLIGHT, + ) + } + + companion object { + private const val TAG = "TorchProvider" + } +}