diff --git a/app/build.gradle.kts b/app/build.gradle.kts index cb5ac391..dc09a3f7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -18,7 +18,7 @@ apply { buildscript { repositories { - maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.7/.m2") + maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.8/.m2") } dependencies { @@ -84,7 +84,7 @@ dependencies { implementation("com.google.android.material:material:1.9.0") // CameraX core library using the camera2 implementation - val cameraxVersion = "1.4.0-alpha04" + val cameraxVersion = "1.4.0-alpha05" // The following line is optional, as the core library is included indirectly by camera-camera2 implementation("androidx.camera:camera-core:${cameraxVersion}") implementation("androidx.camera:camera-camera2:${cameraxVersion}") diff --git a/app/libs/Android.bp b/app/libs/Android.bp index 29ddf1b5..eed8146d 100644 --- a/app/libs/Android.bp +++ b/app/libs/Android.bp @@ -7,7 +7,7 @@ android_library_import { name: "Aperture_androidx.camera_camera-camera2-nodeps", - aars: ["androidx/camera/camera-camera2/1.4.0-alpha04/camera-camera2-1.4.0-alpha04.aar"], + aars: ["androidx/camera/camera-camera2/1.4.0-alpha05/camera-camera2-1.4.0-alpha05.aar"], sdk_version: "34", min_sdk_version: "14", apex_available: [ @@ -32,7 +32,7 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/camera/camera-camera2/1.4.0-alpha04/AndroidManifest.xml", + manifest: "androidx/camera/camera-camera2/1.4.0-alpha05/AndroidManifest.xml", static_libs: [ "Aperture_androidx.camera_camera-camera2-nodeps", "Aperture_androidx.camera_camera-core", @@ -47,7 +47,7 @@ android_library { android_library_import { name: "Aperture_androidx.camera_camera-core-nodeps", - aars: ["androidx/camera/camera-core/1.4.0-alpha04/camera-core-1.4.0-alpha04.aar"], + aars: ["androidx/camera/camera-core/1.4.0-alpha05/camera-core-1.4.0-alpha05.aar"], sdk_version: "34", min_sdk_version: "14", apex_available: [ @@ -59,12 +59,14 @@ android_library_import { "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.concurrent_concurrent-futures", + "androidx.concurrent_concurrent-futures-ktx", "androidx.core_core", "androidx.exifinterface_exifinterface", "androidx.lifecycle_lifecycle-livedata", "auto_value_annotations", "guava", "kotlin-stdlib", + "kotlinx-coroutines-android", ], } @@ -76,26 +78,28 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/camera/camera-core/1.4.0-alpha04/AndroidManifest.xml", + manifest: "androidx/camera/camera-core/1.4.0-alpha05/AndroidManifest.xml", static_libs: [ "Aperture_androidx.camera_camera-core-nodeps", "Aperture_androidx.lifecycle_lifecycle-common", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.concurrent_concurrent-futures", + "androidx.concurrent_concurrent-futures-ktx", "androidx.core_core", "androidx.exifinterface_exifinterface", "androidx.lifecycle_lifecycle-livedata", "auto_value_annotations", "guava", "kotlin-stdlib", + "kotlinx-coroutines-android", ], java_version: "1.7", } android_library_import { name: "Aperture_androidx.camera_camera-extensions-nodeps", - aars: ["androidx/camera/camera-extensions/1.4.0-alpha04/camera-extensions-1.4.0-alpha04.aar"], + aars: ["androidx/camera/camera-extensions/1.4.0-alpha05/camera-extensions-1.4.0-alpha05.aar"], sdk_version: "34", min_sdk_version: "14", apex_available: [ @@ -119,7 +123,7 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/camera/camera-extensions/1.4.0-alpha04/AndroidManifest.xml", + manifest: "androidx/camera/camera-extensions/1.4.0-alpha05/AndroidManifest.xml", static_libs: [ "Aperture_androidx.camera_camera-extensions-nodeps", "Aperture_androidx.camera_camera-core", @@ -133,7 +137,7 @@ android_library { android_library_import { name: "Aperture_androidx.camera_camera-lifecycle-nodeps", - aars: ["androidx/camera/camera-lifecycle/1.4.0-alpha04/camera-lifecycle-1.4.0-alpha04.aar"], + aars: ["androidx/camera/camera-lifecycle/1.4.0-alpha05/camera-lifecycle-1.4.0-alpha05.aar"], sdk_version: "34", min_sdk_version: "14", apex_available: [ @@ -144,9 +148,11 @@ android_library_import { "Aperture_androidx.camera_camera-core", "Aperture_androidx.lifecycle_lifecycle-common", "androidx.concurrent_concurrent-futures", + "androidx.concurrent_concurrent-futures-ktx", "androidx.core_core", "auto_value_annotations", "guava", + "kotlinx-coroutines-android", ], } @@ -158,22 +164,24 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/camera/camera-lifecycle/1.4.0-alpha04/AndroidManifest.xml", + manifest: "androidx/camera/camera-lifecycle/1.4.0-alpha05/AndroidManifest.xml", static_libs: [ "Aperture_androidx.camera_camera-lifecycle-nodeps", "Aperture_androidx.camera_camera-core", "Aperture_androidx.lifecycle_lifecycle-common", "androidx.concurrent_concurrent-futures", + "androidx.concurrent_concurrent-futures-ktx", "androidx.core_core", "auto_value_annotations", "guava", + "kotlinx-coroutines-android", ], java_version: "1.7", } android_library_import { name: "Aperture_androidx.camera_camera-video-nodeps", - aars: ["androidx/camera/camera-video/1.4.0-alpha04/camera-video-1.4.0-alpha04.aar"], + aars: ["androidx/camera/camera-video/1.4.0-alpha05/camera-video-1.4.0-alpha05.aar"], sdk_version: "34", min_sdk_version: "14", apex_available: [ @@ -197,7 +205,7 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/camera/camera-video/1.4.0-alpha04/AndroidManifest.xml", + manifest: "androidx/camera/camera-video/1.4.0-alpha05/AndroidManifest.xml", static_libs: [ "Aperture_androidx.camera_camera-video-nodeps", "Aperture_androidx.camera_camera-core", @@ -211,7 +219,7 @@ android_library { android_library_import { name: "Aperture_androidx.camera_camera-view-nodeps", - aars: ["androidx/camera/camera-view/1.4.0-alpha04/camera-view-1.4.0-alpha04.aar"], + aars: ["androidx/camera/camera-view/1.4.0-alpha05/camera-view-1.4.0-alpha05.aar"], sdk_version: "34", min_sdk_version: "14", apex_available: [ @@ -222,6 +230,7 @@ android_library_import { "Aperture_androidx.camera_camera-core", "Aperture_androidx.camera_camera-lifecycle", "Aperture_androidx.camera_camera-video", + "Aperture_androidx.camera_camera-viewfinder-core", "Aperture_androidx.lifecycle_lifecycle-common", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", @@ -241,12 +250,13 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/camera/camera-view/1.4.0-alpha04/AndroidManifest.xml", + manifest: "androidx/camera/camera-view/1.4.0-alpha05/AndroidManifest.xml", static_libs: [ "Aperture_androidx.camera_camera-view-nodeps", "Aperture_androidx.camera_camera-core", "Aperture_androidx.camera_camera-lifecycle", "Aperture_androidx.camera_camera-video", + "Aperture_androidx.camera_camera-viewfinder-core", "Aperture_androidx.lifecycle_lifecycle-common", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", @@ -259,6 +269,56 @@ android_library { java_version: "1.7", } +android_library_import { + name: "Aperture_androidx.camera_camera-viewfinder-core-nodeps", + aars: ["androidx/camera/camera-viewfinder-core/1.4.0-alpha05/camera-viewfinder-core-1.4.0-alpha05.aar"], + sdk_version: "34", + min_sdk_version: "14", + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], + static_libs: [ + "androidx.annotation_annotation", + "androidx.annotation_annotation-experimental", + "androidx.appcompat_appcompat", + "androidx.concurrent_concurrent-futures", + "androidx.concurrent_concurrent-futures-ktx", + "androidx.core_core", + "androidx.test.espresso.idling-resource", + "auto_value_annotations", + "guava", + "kotlinx-coroutines-android", + "kotlinx-coroutines-core", + ], +} + +android_library { + name: "Aperture_androidx.camera_camera-viewfinder-core", + sdk_version: "34", + min_sdk_version: "14", + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], + manifest: "androidx/camera/camera-viewfinder-core/1.4.0-alpha05/AndroidManifest.xml", + static_libs: [ + "Aperture_androidx.camera_camera-viewfinder-core-nodeps", + "androidx.annotation_annotation", + "androidx.annotation_annotation-experimental", + "androidx.appcompat_appcompat", + "androidx.concurrent_concurrent-futures", + "androidx.concurrent_concurrent-futures-ktx", + "androidx.core_core", + "androidx.test.espresso.idling-resource", + "auto_value_annotations", + "guava", + "kotlinx-coroutines-android", + "kotlinx-coroutines-core", + ], + java_version: "1.7", +} + java_import { name: "Aperture_androidx.lifecycle_lifecycle-common-nodeps", jars: ["androidx/lifecycle/lifecycle-common/2.6.2/lifecycle-common-2.6.2.jar"], diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-alpha04/camera-camera2-1.4.0-alpha04.aar b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha04/camera-camera2-1.4.0-alpha04.aar deleted file mode 100644 index 012924a8..00000000 Binary files a/app/libs/androidx/camera/camera-camera2/1.4.0-alpha04/camera-camera2-1.4.0-alpha04.aar and /dev/null differ diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-alpha04/AndroidManifest.xml b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha05/AndroidManifest.xml similarity index 100% rename from app/libs/androidx/camera/camera-camera2/1.4.0-alpha04/AndroidManifest.xml rename to app/libs/androidx/camera/camera-camera2/1.4.0-alpha05/AndroidManifest.xml diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-alpha04/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha05/AndroidManifest.xml.license similarity index 100% rename from app/libs/androidx/camera/camera-camera2/1.4.0-alpha04/AndroidManifest.xml.license rename to app/libs/androidx/camera/camera-camera2/1.4.0-alpha05/AndroidManifest.xml.license diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-alpha05/camera-camera2-1.4.0-alpha05.aar b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha05/camera-camera2-1.4.0-alpha05.aar new file mode 100644 index 00000000..91b626dc Binary files /dev/null and b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha05/camera-camera2-1.4.0-alpha05.aar differ diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-alpha04/camera-camera2-1.4.0-alpha04.aar.license b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha05/camera-camera2-1.4.0-alpha05.aar.license similarity index 100% rename from app/libs/androidx/camera/camera-camera2/1.4.0-alpha04/camera-camera2-1.4.0-alpha04.aar.license rename to app/libs/androidx/camera/camera-camera2/1.4.0-alpha05/camera-camera2-1.4.0-alpha05.aar.license diff --git a/app/libs/androidx/camera/camera-core/1.4.0-alpha04/camera-core-1.4.0-alpha04.aar b/app/libs/androidx/camera/camera-core/1.4.0-alpha04/camera-core-1.4.0-alpha04.aar deleted file mode 100644 index eecf60bd..00000000 Binary files a/app/libs/androidx/camera/camera-core/1.4.0-alpha04/camera-core-1.4.0-alpha04.aar and /dev/null differ diff --git a/app/libs/androidx/camera/camera-core/1.4.0-alpha04/AndroidManifest.xml b/app/libs/androidx/camera/camera-core/1.4.0-alpha05/AndroidManifest.xml similarity index 100% rename from app/libs/androidx/camera/camera-core/1.4.0-alpha04/AndroidManifest.xml rename to app/libs/androidx/camera/camera-core/1.4.0-alpha05/AndroidManifest.xml diff --git a/app/libs/androidx/camera/camera-core/1.4.0-alpha04/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-core/1.4.0-alpha05/AndroidManifest.xml.license similarity index 100% rename from app/libs/androidx/camera/camera-core/1.4.0-alpha04/AndroidManifest.xml.license rename to app/libs/androidx/camera/camera-core/1.4.0-alpha05/AndroidManifest.xml.license diff --git a/app/libs/androidx/camera/camera-core/1.4.0-alpha05/camera-core-1.4.0-alpha05.aar b/app/libs/androidx/camera/camera-core/1.4.0-alpha05/camera-core-1.4.0-alpha05.aar new file mode 100644 index 00000000..097d0f0d Binary files /dev/null and b/app/libs/androidx/camera/camera-core/1.4.0-alpha05/camera-core-1.4.0-alpha05.aar differ diff --git a/app/libs/androidx/camera/camera-core/1.4.0-alpha04/camera-core-1.4.0-alpha04.aar.license b/app/libs/androidx/camera/camera-core/1.4.0-alpha05/camera-core-1.4.0-alpha05.aar.license similarity index 100% rename from app/libs/androidx/camera/camera-core/1.4.0-alpha04/camera-core-1.4.0-alpha04.aar.license rename to app/libs/androidx/camera/camera-core/1.4.0-alpha05/camera-core-1.4.0-alpha05.aar.license diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-alpha04/camera-extensions-1.4.0-alpha04.aar b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha04/camera-extensions-1.4.0-alpha04.aar deleted file mode 100644 index c560935a..00000000 Binary files a/app/libs/androidx/camera/camera-extensions/1.4.0-alpha04/camera-extensions-1.4.0-alpha04.aar and /dev/null differ diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-alpha04/AndroidManifest.xml b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha05/AndroidManifest.xml similarity index 100% rename from app/libs/androidx/camera/camera-extensions/1.4.0-alpha04/AndroidManifest.xml rename to app/libs/androidx/camera/camera-extensions/1.4.0-alpha05/AndroidManifest.xml diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-alpha04/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha05/AndroidManifest.xml.license similarity index 100% rename from app/libs/androidx/camera/camera-extensions/1.4.0-alpha04/AndroidManifest.xml.license rename to app/libs/androidx/camera/camera-extensions/1.4.0-alpha05/AndroidManifest.xml.license diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-alpha05/camera-extensions-1.4.0-alpha05.aar b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha05/camera-extensions-1.4.0-alpha05.aar new file mode 100644 index 00000000..dfce5773 Binary files /dev/null and b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha05/camera-extensions-1.4.0-alpha05.aar differ diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-alpha04/camera-extensions-1.4.0-alpha04.aar.license b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha05/camera-extensions-1.4.0-alpha05.aar.license similarity index 100% rename from app/libs/androidx/camera/camera-extensions/1.4.0-alpha04/camera-extensions-1.4.0-alpha04.aar.license rename to app/libs/androidx/camera/camera-extensions/1.4.0-alpha05/camera-extensions-1.4.0-alpha05.aar.license diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha04/camera-lifecycle-1.4.0-alpha04.aar b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha04/camera-lifecycle-1.4.0-alpha04.aar deleted file mode 100644 index 633851ef..00000000 Binary files a/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha04/camera-lifecycle-1.4.0-alpha04.aar and /dev/null differ diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha04/AndroidManifest.xml b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha05/AndroidManifest.xml similarity index 100% rename from app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha04/AndroidManifest.xml rename to app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha05/AndroidManifest.xml diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha04/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha05/AndroidManifest.xml.license similarity index 100% rename from app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha04/AndroidManifest.xml.license rename to app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha05/AndroidManifest.xml.license diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha05/camera-lifecycle-1.4.0-alpha05.aar b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha05/camera-lifecycle-1.4.0-alpha05.aar new file mode 100644 index 00000000..3451a7ba Binary files /dev/null and b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha05/camera-lifecycle-1.4.0-alpha05.aar differ diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha04/camera-lifecycle-1.4.0-alpha04.aar.license b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha05/camera-lifecycle-1.4.0-alpha05.aar.license similarity index 100% rename from app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha04/camera-lifecycle-1.4.0-alpha04.aar.license rename to app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha05/camera-lifecycle-1.4.0-alpha05.aar.license diff --git a/app/libs/androidx/camera/camera-video/1.4.0-alpha04/camera-video-1.4.0-alpha04.aar b/app/libs/androidx/camera/camera-video/1.4.0-alpha04/camera-video-1.4.0-alpha04.aar deleted file mode 100644 index 2c6d190f..00000000 Binary files a/app/libs/androidx/camera/camera-video/1.4.0-alpha04/camera-video-1.4.0-alpha04.aar and /dev/null differ diff --git a/app/libs/androidx/camera/camera-video/1.4.0-alpha04/AndroidManifest.xml b/app/libs/androidx/camera/camera-video/1.4.0-alpha05/AndroidManifest.xml similarity index 100% rename from app/libs/androidx/camera/camera-video/1.4.0-alpha04/AndroidManifest.xml rename to app/libs/androidx/camera/camera-video/1.4.0-alpha05/AndroidManifest.xml diff --git a/app/libs/androidx/camera/camera-video/1.4.0-alpha04/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-video/1.4.0-alpha05/AndroidManifest.xml.license similarity index 100% rename from app/libs/androidx/camera/camera-video/1.4.0-alpha04/AndroidManifest.xml.license rename to app/libs/androidx/camera/camera-video/1.4.0-alpha05/AndroidManifest.xml.license diff --git a/app/libs/androidx/camera/camera-video/1.4.0-alpha05/camera-video-1.4.0-alpha05.aar b/app/libs/androidx/camera/camera-video/1.4.0-alpha05/camera-video-1.4.0-alpha05.aar new file mode 100644 index 00000000..e5682c67 Binary files /dev/null and b/app/libs/androidx/camera/camera-video/1.4.0-alpha05/camera-video-1.4.0-alpha05.aar differ diff --git a/app/libs/androidx/camera/camera-video/1.4.0-alpha04/camera-video-1.4.0-alpha04.aar.license b/app/libs/androidx/camera/camera-video/1.4.0-alpha05/camera-video-1.4.0-alpha05.aar.license similarity index 100% rename from app/libs/androidx/camera/camera-video/1.4.0-alpha04/camera-video-1.4.0-alpha04.aar.license rename to app/libs/androidx/camera/camera-video/1.4.0-alpha05/camera-video-1.4.0-alpha05.aar.license diff --git a/app/libs/androidx/camera/camera-view/1.4.0-alpha04/camera-view-1.4.0-alpha04.aar b/app/libs/androidx/camera/camera-view/1.4.0-alpha04/camera-view-1.4.0-alpha04.aar deleted file mode 100644 index f03cfe98..00000000 Binary files a/app/libs/androidx/camera/camera-view/1.4.0-alpha04/camera-view-1.4.0-alpha04.aar and /dev/null differ diff --git a/app/libs/androidx/camera/camera-view/1.4.0-alpha04/AndroidManifest.xml b/app/libs/androidx/camera/camera-view/1.4.0-alpha05/AndroidManifest.xml similarity index 100% rename from app/libs/androidx/camera/camera-view/1.4.0-alpha04/AndroidManifest.xml rename to app/libs/androidx/camera/camera-view/1.4.0-alpha05/AndroidManifest.xml diff --git a/app/libs/androidx/camera/camera-view/1.4.0-alpha04/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-view/1.4.0-alpha05/AndroidManifest.xml.license similarity index 100% rename from app/libs/androidx/camera/camera-view/1.4.0-alpha04/AndroidManifest.xml.license rename to app/libs/androidx/camera/camera-view/1.4.0-alpha05/AndroidManifest.xml.license diff --git a/app/libs/androidx/camera/camera-view/1.4.0-alpha05/camera-view-1.4.0-alpha05.aar b/app/libs/androidx/camera/camera-view/1.4.0-alpha05/camera-view-1.4.0-alpha05.aar new file mode 100644 index 00000000..bc2d9300 Binary files /dev/null and b/app/libs/androidx/camera/camera-view/1.4.0-alpha05/camera-view-1.4.0-alpha05.aar differ diff --git a/app/libs/androidx/camera/camera-view/1.4.0-alpha04/camera-view-1.4.0-alpha04.aar.license b/app/libs/androidx/camera/camera-view/1.4.0-alpha05/camera-view-1.4.0-alpha05.aar.license similarity index 100% rename from app/libs/androidx/camera/camera-view/1.4.0-alpha04/camera-view-1.4.0-alpha04.aar.license rename to app/libs/androidx/camera/camera-view/1.4.0-alpha05/camera-view-1.4.0-alpha05.aar.license diff --git a/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/AndroidManifest.xml b/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/AndroidManifest.xml new file mode 100644 index 00000000..f06fa247 --- /dev/null +++ b/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/AndroidManifest.xml.license new file mode 100644 index 00000000..7744a52a --- /dev/null +++ b/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/AndroidManifest.xml.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2023-2024 The Android Open Source Project + +SPDX-License-Identifier: Apache-2.0 diff --git a/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/camera-viewfinder-core-1.4.0-alpha05.aar b/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/camera-viewfinder-core-1.4.0-alpha05.aar new file mode 100644 index 00000000..cf7c5615 Binary files /dev/null and b/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/camera-viewfinder-core-1.4.0-alpha05.aar differ diff --git a/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/camera-viewfinder-core-1.4.0-alpha05.aar.license b/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/camera-viewfinder-core-1.4.0-alpha05.aar.license new file mode 100644 index 00000000..7744a52a --- /dev/null +++ b/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/camera-viewfinder-core-1.4.0-alpha05.aar.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2023-2024 The Android Open Source Project + +SPDX-License-Identifier: Apache-2.0 diff --git a/app/src/main/java/org/lineageos/aperture/ApertureApplication.kt b/app/src/main/java/org/lineageos/aperture/ApertureApplication.kt index 71e6a9bb..0a564ebe 100644 --- a/app/src/main/java/org/lineageos/aperture/ApertureApplication.kt +++ b/app/src/main/java/org/lineageos/aperture/ApertureApplication.kt @@ -1,18 +1,27 @@ /* - * SPDX-FileCopyrightText: 2023 The LineageOS Project + * SPDX-FileCopyrightText: 2023-2024 The LineageOS Project * SPDX-License-Identifier: Apache-2.0 */ package org.lineageos.aperture +import android.annotation.SuppressLint import android.app.Application +import androidx.camera.camera2.internal.CameraIdUtil import com.google.android.material.color.DynamicColors +import org.lineageos.aperture.ext.getStringArray class ApertureApplication : Application() { + @SuppressLint("RestrictedApi") override fun onCreate() { super.onCreate() // Observe dynamic colors changes DynamicColors.applyToActivitiesIfAvailable(this) + + // Set backward compatible camera ids + CameraIdUtil.setBackwardCompatibleCameraIds( + resources.getStringArray(this, R.array.config_backwardCompatibleCameraIds).asList() + ) } } diff --git a/settings.gradle.kts b/settings.gradle.kts index b23a790c..b1e28581 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2023 The LineageOS Project + * SPDX-FileCopyrightText: 2022-2024 The LineageOS Project * SPDX-License-Identifier: Apache-2.0 */ @@ -13,7 +13,7 @@ pluginManagement { dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { - maven("https://raw.githubusercontent.com/lineage-next/camerax-aperture/c8fdd97d7a0a080cb520acd7855717b9f60cec1f/.m2") + maven("https://raw.githubusercontent.com/lineage-next/camerax-aperture/2f3d84611740152a503b606584c93d64dba4ebcd/.m2") google() mavenCentral() }