Merge branch 'main' into hello-uwb

Author: bobwzy

README.md

@@ -21,7 +21,7 @@ Browse the samples inside each topic samples folder:
 - [User-interface](https://github.com/android/platform-samples/tree/main/samples/user-interface)
 - More to come...
 
-We regularly add new samples to this repository. You can find a list of all the available samples [here](https://github.com/android/platform-samples/tree/main/samples).
+We are constantly adding new samples to this repository. You can find a list of all the available samples [here](https://github.com/android/platform-samples/tree/main/samples).
 
 ## How to run
 

app/src/main/java/com/example/platform/app/SampleDemo.kt

@@ -27,7 +27,10 @@ import com.example.platform.accessibility.SpeakableText
 import com.example.platform.camera.imagecapture.Camera2ImageCapture
 import com.example.platform.camera.imagecapture.Camera2UltraHDRCapture
 import com.example.platform.camera.preview.Camera2Preview
+import com.example.platform.camerax.video.CameraXVideo
 import com.example.platform.camerax.basic.CameraXBasic
+import com.example.platform.camerax.extensions.CameraXExtensions
+import com.example.platform.camerax.mlkit.CameraXMlKit
 import com.example.platform.connectivity.audio.AudioCommsSample
 import com.example.platform.connectivity.bluetooth.ble.BLEScanIntentSample
 import com.example.platform.connectivity.bluetooth.ble.ConnectGATTSample
@@ -64,6 +67,7 @@ import com.example.platform.shared.MinSdkBox
 import com.example.platform.storage.mediastore.MediaStoreQuerySample
 import com.example.platform.storage.mediastore.SelectedPhotosAccessSample
 import com.example.platform.storage.photopicker.PhotoPickerSample
+import com.example.platform.storage.storageaccessframework.GetContentSample
 import com.example.platform.ui.appwidgets.AppWidgets
 import com.example.platform.ui.constraintlayout.AdvancedArrangementFragment
 import com.example.platform.ui.constraintlayout.AdvancedChainsFragment
@@ -230,6 +234,33 @@ val SAMPLE_DEMOS by lazy {
             tags = listOf("CameraX"),
             content = { CameraXBasic() },
         ),
+        ComposableSampleDemo(
+            id = "camerax-video-capture",
+            name = "CameraX • Basic Video Capture",
+            description = "This sample demonstrates how to capture a video using CameraX",
+            documentation = "https://developer.android.com/training/camerax",
+            apiSurface = CameraCameraXApiSurface,
+            tags = listOf("CameraX"),
+            content = { CameraXVideo() },
+        ),
+        ComposableSampleDemo(
+            id = "camerax-extensions",
+            name = "CameraX • Extensions",
+            description = "This sample demonstrates how to check for and utilize CameraX Extensions",
+            documentation = "https://developer.android.com/training/camerax",
+            apiSurface = CameraCameraXApiSurface,
+            tags = listOf("CameraX"),
+            content = { CameraXExtensions() },
+        ),
+        ComposableSampleDemo(
+            id = "camerax-ml-kit",
+            name = "CameraX • MLKit Sample",
+            description = "This sample demonstrates how to use MLKit with CameraX",
+            documentation = "https://developer.android.com/training/camerax",
+            apiSurface = CameraCameraXApiSurface,
+            tags = listOf("CameraX"),
+            content = { CameraXMlKit() },
+        ),
 
         ComposableSampleDemo(
             id = "communication-audio-manager",
@@ -589,6 +620,14 @@ val SAMPLE_DEMOS by lazy {
             apiSurface = StorageApiSurface,
             content = { MediaStoreQuerySample() },
         ),
+        ComposableSampleDemo(
+            id = "storageaccessframework-getcontent",
+            name = "Storage Access Framework - GET_CONTENT",
+            description = "Open a document using the Storage Access Framework",
+            documentation = "https://developer.android.com/training/data-storage/shared/documents-files#open-file",
+            apiSurface = StorageApiSurface,
+            content = { GetContentSample() },
+        ),
         ComposableSampleDemo(
             id = "selected-photos-access",
             name = "Selected Photos Access",

gradle/libs.versions.toml

@@ -30,6 +30,7 @@ material = "1.12.0"
 coil = "2.4.0"
 navigationCompose = "2.8.7"
 coroutines = "1.7.3"
+photopickerCompose = "1.0.0-alpha01"
 play-services-location = "21.1.0"
 
 accompanist = "0.32.0"
@@ -72,6 +73,7 @@ androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref =
 androidx-fragment-compose = { module = "androidx.fragment:fragment-compose", version.ref = "fragmentCompose" }
 androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationCompose" }
 androidx-uwb = { module = "androidx.core.uwb:uwb", version.ref = "uwb" }
+androidx-photopicker-compose = { module = "androidx.photopicker:photopicker-compose", version.ref = "photopickerCompose" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }

samples/accessibility/build.gradle.kts

@@ -42,6 +42,7 @@ android {
 dependencies {
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.ui)
+    implementation(libs.androidx.ui.tooling)
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
     implementation(libs.androidx.fragment)

samples/camera/camerax/src/main/AndroidManifest.xml

@@ -23,6 +23,8 @@
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="28" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+
     <uses-feature
         android:name="android.hardware.camera"
         android:required="false" />