Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_p…

…ackages_apps_Aperture into udc-qpr2

Change-Id: Ida22d40a858c1acdc620429c6980bfaf63c7b20d
Signed-off-by: Leonardo Ledda <[email protected]>

app/Android.bp

@@ -41,6 +41,7 @@ android_app {
         "Flash_androidx.camera_camera-lifecycle",
         "Flash_androidx.camera_camera-video",
         "Flash_androidx.camera_camera-view",
+        "Flash_androidx.camera_camera-viewfinder",
         "Flash_androidx.camera_camera-extensions",
         "Flash_androidx.media3_media3-exoplayer",
         "Flash_androidx.media3_media3-ui",

app/build.gradle.kts

@@ -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-alpha05"
+    val cameraxVersion = "1.4.0-beta01"
     // 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}")
@@ -94,6 +94,8 @@ dependencies {
     implementation("androidx.camera:camera-video:${cameraxVersion}")
     // If you want to additionally use the CameraX View class
     implementation("androidx.camera:camera-view:${cameraxVersion}")
+    // If you want to additionally use the CameraX Viewfinder class
+    implementation("androidx.camera:camera-viewfinder:1.4.0-alpha06")
     // If you want to additionally use the CameraX Extensions library
     implementation("androidx.camera:camera-extensions:${cameraxVersion}")
 

app/libs/Android.bp

@@ -7,7 +7,7 @@
 
 android_library_import {
     name: "Flash_androidx.camera_camera-camera2-nodeps",
-    aars: ["androidx/camera/camera-camera2/1.4.0-alpha05/camera-camera2-1.4.0-alpha05.aar"],
+    aars: ["androidx/camera/camera-camera2/1.4.0-beta01/camera-camera2-1.4.0-beta01.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-alpha05/AndroidManifest.xml",
+    manifest: "androidx/camera/camera-camera2/1.4.0-beta01/AndroidManifest.xml",
     static_libs: [
         "Flash_androidx.camera_camera-camera2-nodeps",
         "Flash_androidx.camera_camera-core",
@@ -47,7 +47,7 @@ android_library {
 
 android_library_import {
     name: "Flash_androidx.camera_camera-core-nodeps",
-    aars: ["androidx/camera/camera-core/1.4.0-alpha05/camera-core-1.4.0-alpha05.aar"],
+    aars: ["androidx/camera/camera-core/1.4.0-beta01/camera-core-1.4.0-beta01.aar"],
     sdk_version: "34",
     min_sdk_version: "14",
     apex_available: [
@@ -79,7 +79,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/camera/camera-core/1.4.0-alpha05/AndroidManifest.xml",
+    manifest: "androidx/camera/camera-core/1.4.0-beta01/AndroidManifest.xml",
     static_libs: [
         "Flash_androidx.camera_camera-core-nodeps",
         "Flash_androidx.lifecycle_lifecycle-common",
@@ -100,7 +100,7 @@ android_library {
 
 android_library_import {
     name: "Flash_androidx.camera_camera-extensions-nodeps",
-    aars: ["androidx/camera/camera-extensions/1.4.0-alpha05/camera-extensions-1.4.0-alpha05.aar"],
+    aars: ["androidx/camera/camera-extensions/1.4.0-beta01/camera-extensions-1.4.0-beta01.aar"],
     sdk_version: "34",
     min_sdk_version: "14",
     apex_available: [
@@ -124,7 +124,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/camera/camera-extensions/1.4.0-alpha05/AndroidManifest.xml",
+    manifest: "androidx/camera/camera-extensions/1.4.0-beta01/AndroidManifest.xml",
     static_libs: [
         "Flash_androidx.camera_camera-extensions-nodeps",
         "Flash_androidx.camera_camera-core",
@@ -138,7 +138,7 @@ android_library {
 
 android_library_import {
     name: "Flash_androidx.camera_camera-lifecycle-nodeps",
-    aars: ["androidx/camera/camera-lifecycle/1.4.0-alpha05/camera-lifecycle-1.4.0-alpha05.aar"],
+    aars: ["androidx/camera/camera-lifecycle/1.4.0-beta01/camera-lifecycle-1.4.0-beta01.aar"],
     sdk_version: "34",
     min_sdk_version: "14",
     apex_available: [
@@ -165,7 +165,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/camera/camera-lifecycle/1.4.0-alpha05/AndroidManifest.xml",
+    manifest: "androidx/camera/camera-lifecycle/1.4.0-beta01/AndroidManifest.xml",
     static_libs: [
         "Flash_androidx.camera_camera-lifecycle-nodeps",
         "Flash_androidx.camera_camera-core",
@@ -182,7 +182,7 @@ android_library {
 
 android_library_import {
     name: "Flash_androidx.camera_camera-video-nodeps",
-    aars: ["androidx/camera/camera-video/1.4.0-alpha05/camera-video-1.4.0-alpha05.aar"],
+    aars: ["androidx/camera/camera-video/1.4.0-beta01/camera-video-1.4.0-beta01.aar"],
     sdk_version: "34",
     min_sdk_version: "14",
     apex_available: [
@@ -206,7 +206,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/camera/camera-video/1.4.0-alpha05/AndroidManifest.xml",
+    manifest: "androidx/camera/camera-video/1.4.0-beta01/AndroidManifest.xml",
     static_libs: [
         "Flash_androidx.camera_camera-video-nodeps",
         "Flash_androidx.camera_camera-core",
@@ -220,7 +220,7 @@ android_library {
 
 android_library_import {
     name: "Flash_androidx.camera_camera-view-nodeps",
-    aars: ["androidx/camera/camera-view/1.4.0-alpha05/camera-view-1.4.0-alpha05.aar"],
+    aars: ["androidx/camera/camera-view/1.4.0-beta01/camera-view-1.4.0-beta01.aar"],
     sdk_version: "34",
     min_sdk_version: "14",
     apex_available: [
@@ -231,7 +231,6 @@ android_library_import {
         "Flash_androidx.camera_camera-core",
         "Flash_androidx.camera_camera-lifecycle",
         "Flash_androidx.camera_camera-video",
-        "Flash_androidx.camera_camera-viewfinder-core",
         "Flash_androidx.lifecycle_lifecycle-common",
         "androidx.annotation_annotation",
         "androidx.annotation_annotation-experimental",
@@ -251,13 +250,12 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/camera/camera-view/1.4.0-alpha05/AndroidManifest.xml",
+    manifest: "androidx/camera/camera-view/1.4.0-beta01/AndroidManifest.xml",
     static_libs: [
         "Flash_androidx.camera_camera-view-nodeps",
         "Flash_androidx.camera_camera-core",
         "Flash_androidx.camera_camera-lifecycle",
         "Flash_androidx.camera_camera-video",
-        "Flash_androidx.camera_camera-viewfinder-core",
         "Flash_androidx.lifecycle_lifecycle-common",
         "androidx.annotation_annotation",
         "androidx.annotation_annotation-experimental",
@@ -270,9 +268,61 @@ android_library {
     java_version: "1.7",
 }
 
+android_library_import {
+    name: "Flash_androidx.camera_camera-viewfinder-nodeps",
+    aars: ["androidx/camera/camera-viewfinder/1.4.0-alpha06/camera-viewfinder-1.4.0-alpha06.aar"],
+    sdk_version: "34",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    static_libs: [
+        "Flash_androidx.camera_camera-viewfinder-core",
+        "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: "Flash_androidx.camera_camera-viewfinder",
+    sdk_version: "34",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    manifest: "androidx/camera/camera-viewfinder/1.4.0-alpha06/AndroidManifest.xml",
+    static_libs: [
+        "Flash_androidx.camera_camera-viewfinder-nodeps",
+        "Flash_androidx.camera_camera-viewfinder-core",
+        "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",
+}
+
 android_library_import {
     name: "Flash_androidx.camera_camera-viewfinder-core-nodeps",
-    aars: ["androidx/camera/camera-viewfinder-core/1.4.0-alpha05/camera-viewfinder-core-1.4.0-alpha05.aar"],
+    aars: ["androidx/camera/camera-viewfinder-core/1.4.0-alpha06/camera-viewfinder-core-1.4.0-alpha06.aar"],
     sdk_version: "34",
     min_sdk_version: "14",
     apex_available: [
@@ -302,7 +352,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/camera/camera-viewfinder-core/1.4.0-alpha05/AndroidManifest.xml",
+    manifest: "androidx/camera/camera-viewfinder-core/1.4.0-alpha06/AndroidManifest.xml",
     static_libs: [
         "Flash_androidx.camera_camera-viewfinder-core-nodeps",
         "androidx.annotation_annotation",

app/libs/androidx/camera/camera-camera2/1.4.0-alpha05/AndroidManifest.xml → app/libs/androidx/camera/camera-camera2/1.4.0-beta01/AndroidManifest.xml

@@ -18,7 +18,7 @@ limitations under the License.
     xmlns:tools="http://schemas.android.com/tools"
     package="androidx.camera.camera2" >
 
-    <uses-sdk android:minSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="21" />
 
     <application>
         <service

app/libs/androidx/camera/camera-core/1.4.0-alpha05/AndroidManifest.xml → app/libs/androidx/camera/camera-core/1.4.0-beta01/AndroidManifest.xml

@@ -18,7 +18,7 @@ limitations under the License.
     xmlns:tools="http://schemas.android.com/tools"
     package="androidx.camera.core" >
 
-    <uses-sdk android:minSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="21" />
 
     <application>
 

app/libs/androidx/camera/camera-extensions/1.4.0-alpha05/AndroidManifest.xml → app/libs/androidx/camera/camera-extensions/1.4.0-beta01/AndroidManifest.xml

@@ -17,7 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.camera.extensions" >
 
-    <uses-sdk android:minSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="21" />
 
     <queries>
         <intent>

app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha05/AndroidManifest.xml → app/libs/androidx/camera/camera-lifecycle/1.4.0-beta01/AndroidManifest.xml

@@ -2,6 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.camera.lifecycle" >
 
-    <uses-sdk android:minSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="21" />
 
 </manifest>

app/libs/androidx/camera/camera-video/1.4.0-alpha05/AndroidManifest.xml → app/libs/androidx/camera/camera-video/1.4.0-beta01/AndroidManifest.xml

@@ -2,6 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.camera.video" >
 
-    <uses-sdk android:minSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="21" />
 
 </manifest>

app/libs/androidx/camera/camera-view/1.4.0-alpha05/AndroidManifest.xml → app/libs/androidx/camera/camera-view/1.4.0-beta01/AndroidManifest.xml

@@ -2,6 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.camera.view" >
 
-    <uses-sdk android:minSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="21" />
 
 </manifest>

app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/AndroidManifest.xml → app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha06/AndroidManifest.xml

@@ -2,6 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.camera.viewfinder.core" >
 
-    <uses-sdk android:minSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="21" />
 
 </manifest>

app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha06/AndroidManifest.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2022 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.camera.viewfinder" >
+
+    <uses-sdk android:minSdkVersion="21" />
+
+</manifest>

app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha06/AndroidManifest.xml.license

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2022-2024 The Android Open Source Project
+
+SPDX-License-Identifier: Apache-2.0

app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha06/camera-viewfinder-1.4.0-alpha06.aar.license

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2022-2024 The Android Open Source Project
+
+SPDX-License-Identifier: Apache-2.0