Merge branch 'main' into askandroid/snippet-migration

Author: cartland

compose/snippets/build.gradle.kts

@@ -163,4 +163,6 @@ dependencies {
     androidTestImplementation(libs.androidx.compose.ui.test.junit4.accessibility)
     debugImplementation(libs.androidx.compose.ui.test.manifest)
 
+    androidTestImplementation(libs.androidx.glance.testing)
+    androidTestImplementation(libs.androidx.glance.appwidget.testing)
 }

compose/snippets/src/androidTest/java/com/example/compose/snippets/glance/GlanceUnitTest.kt

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2025 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
+ *
+ *     https://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.
+ */
+
+package com.example.compose.snippets.glance
+
+import androidx.compose.runtime.Composable
+import androidx.glance.GlanceModifier
+import androidx.glance.appwidget.testing.unit.runGlanceAppWidgetUnitTest
+import androidx.glance.layout.Row
+import androidx.glance.semantics.semantics
+import androidx.glance.semantics.testTag
+import androidx.glance.testing.unit.assertHasText
+import androidx.glance.testing.unit.hasTestTag
+import androidx.glance.text.Text
+import org.junit.Test
+
+// [START android_compose_glance_unit_test]
+private const val FAKE_HEADLINE = "EXTRA! EXTRA! READ ALL ABOUT IT!"
+
+class MyGlanceComposableTest {
+    @Test
+    fun myNewsItemComposable_largeSize_hasHeadline() = runGlanceAppWidgetUnitTest {
+        // Set the composable to test
+        provideComposable {
+            MyNewsItemComposable(FAKE_HEADLINE)
+        }
+
+        // Perform assertions
+        onNode(hasTestTag("headline"))
+            .assertHasText(FAKE_HEADLINE)
+    }
+
+
+    @Composable
+    fun MyNewsItemComposable(headline: String) {
+        Row {
+            Text(
+                text = headline,
+                modifier = GlanceModifier.semantics { testTag = "headline" },
+            )
+        }
+    }
+}
+// [END android_compose_glance_unit_test]

gradle/libs.versions.toml

@@ -126,6 +126,8 @@ androidx-emoji2-views = { module = "androidx.emoji2:emoji2-views", version.ref =
 androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "androidx-fragment-ktx" }
 androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "androidx-glance-appwidget" }
 androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance-appwidget" }
+androidx-glance-testing = { group = "androidx.glance", name = "glance-testing", version.ref = "androidx-glance-appwidget" }
+androidx-glance-appwidget-testing = { group = "androidx.glance", name = "glance-appwidget-testing", version.ref = "androidx-glance-appwidget" }
 androidx-graphics-shapes = "androidx.graphics:graphics-shapes:1.0.1"
 androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" }
 androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle-runtime-compose" }

xr/src/main/java/com/example/xr/arcore/Anchors.kt

@@ -21,6 +21,7 @@ import androidx.xr.arcore.AnchorCreateSuccess
 import androidx.xr.arcore.Trackable
 import androidx.xr.runtime.Config
 import androidx.xr.runtime.Session
+import androidx.xr.runtime.SessionConfigureConfigurationNotSupported
 import androidx.xr.runtime.SessionConfigureSuccess
 import androidx.xr.runtime.math.Pose
 import androidx.xr.scenecore.AnchorEntity
@@ -34,6 +35,8 @@ fun configureAnchoring(session: Session) {
     )
     when (val result = session.configure(newConfig)) {
         is SessionConfigureSuccess -> TODO(/* Success! */)
+        is SessionConfigureConfigurationNotSupported ->
+            TODO(/* Some combinations of configurations are not valid. Handle this failure case. */)
         else ->
             TODO(/* The session could not be configured. See SessionConfigureResult for possible causes. */)
     }

xr/src/main/java/com/example/xr/arcore/Hands.kt

@@ -23,6 +23,7 @@ import androidx.xr.arcore.Hand
 import androidx.xr.arcore.HandJointType
 import androidx.xr.runtime.Config
 import androidx.xr.runtime.Session
+import androidx.xr.runtime.SessionConfigureConfigurationNotSupported
 import androidx.xr.runtime.SessionConfigureSuccess
 import androidx.xr.runtime.math.Pose
 import androidx.xr.runtime.math.Quaternion
@@ -40,6 +41,8 @@ fun ComponentActivity.configureSession(session: Session) {
     )
     when (val result = session.configure(newConfig)) {
         is SessionConfigureSuccess -> TODO(/* Success! */)
+        is SessionConfigureConfigurationNotSupported ->
+            TODO(/* Some combinations of configurations are not valid. Handle this failure case. */)
         else ->
             TODO(/* The session could not be configured. See SessionConfigureResult for possible causes. */)
     }

xr/src/main/java/com/example/xr/arcore/Planes.kt

@@ -19,6 +19,7 @@ package com.example.xr.arcore
 import androidx.xr.arcore.Plane
 import androidx.xr.runtime.Config
 import androidx.xr.runtime.Session
+import androidx.xr.runtime.SessionConfigureConfigurationNotSupported
 import androidx.xr.runtime.SessionConfigureSuccess
 import androidx.xr.runtime.math.Pose
 import androidx.xr.runtime.math.Ray
@@ -31,6 +32,8 @@ fun configurePlaneTracking(session: Session) {
     )
     when (val result = session.configure(newConfig)) {
         is SessionConfigureSuccess -> TODO(/* Success! */)
+        is SessionConfigureConfigurationNotSupported ->
+            TODO(/* Some combinations of configurations are not valid. Handle this failure case. */)
         else ->
             TODO(/* The session could not be configured. See SessionConfigureResult for possible causes. */)
     }