diff --git a/.idea/other.xml b/.idea/other.xml deleted file mode 100644 index 94c96f631..000000000 --- a/.idea/other.xml +++ /dev/null @@ -1,318 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3f896db82..998e1adaf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -28,10 +28,11 @@ android:required="false" /> + + - + + - // Window color mode APIs require API level 26+ - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + JcaApp( + previewMode = getPreviewMode(), + isDebugMode = isDebugMode, + openAppSettings = ::openAppSettings, + onRequestWindowColorMode = { colorMode -> + // Window color mode APIs require API level 26+ Log.d( TAG, "Setting window color mode to:" + " ${colorMode.toColorModeString()}" ) window?.colorMode = colorMode + }, + onFirstFrameCaptureCompleted = { + firstFrameComplete?.complete(Unit) } - }, - onFirstFrameCaptureCompleted = { - firstFrameComplete?.complete(Unit) - } - ) + ) + } } } } diff --git a/jetpack-camera-app b/jetpack-camera-app new file mode 160000 index 000000000..31a27cd5e --- /dev/null +++ b/jetpack-camera-app @@ -0,0 +1 @@ +Subproject commit 31a27cd5e98901bbc5f4a22fd978f5e40a380c77