Merge branch 'main' into feature/xr/wrap-up

Author: devbridie

.google/packaging.yaml

@@ -0,0 +1,38 @@
+# Copyright (C) 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.
+#
+# GOOGLE SAMPLE PACKAGING DATA
+#
+# This file is used by Google as part of our samples packaging process.
+# End users may safely ignore this file. It has no relevance to other systems.
+---
+status:       PUBLISHED
+technologies: [Android, AI, XR, JetpackCompose]
+categories:
+  - Jetpack
+  - Artificial Intelligence
+  - Machine Learning
+  - Jetpack Compose Layouts
+  - Wear OS
+  - Android XR
+languages:    [Kotlin]
+solutions:
+  - Mobile
+  - XR
+  - Wear
+github:       android/androidify
+level:        INTERMEDIATE
+apiRefs:
+  - android:androidx.compose.Composable
+license: apache2

app/src/main/res/values/wear.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     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.
+-->
+<resources xmlns:tools="http://schemas.android.com/tools" tools:keep="@array/android_wear_capabilities">
+    <string-array name="android_wear_capabilities">
+        <item>androidify_phone</item>
+    </string-array>
+</resources>

core/testing/src/main/java/com/android/developers/testing/repository/FakeWatchFaceInstallationRepository.kt

@@ -75,6 +75,11 @@ class FakeWatchFaceInstallationRepository : WatchFaceInstallationRepository {
         _watchFaceInstallationStatus.value = WatchFaceInstallationStatus.NotStarted
     }
 
+    override suspend fun prepareForTransfer() {
+        transferId = generateTransferId()
+        _watchFaceInstallationStatus.value = WatchFaceInstallationStatus.Preparing
+    }
+
     private fun generateTransferId() = UUID.randomUUID().toString().take(8)
 
     public fun setWatchAsConnected() {

feature/results/src/androidTest/java/com/android/developers/androidify/results/ResultsScreenTest.kt

@@ -190,7 +190,6 @@ class ResultsScreenTest {
         val configProvider = ConfigProvider(TestRemoteConfigDataSource(false))
         val viewModel = ResultsViewModel(testUri, originalImageUrl = testUri, null, configProvider)
 
-
         composeTestRule.setContent {
             // Disable animation
             SharedElementContextPreview {

feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportLayoutType.kt

@@ -0,0 +1,35 @@
+/*
+ * 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.android.developers.androidify.customize
+
+import androidx.compose.runtime.Composable
+import androidx.xr.compose.platform.LocalSpatialCapabilities
+import com.android.developers.androidify.util.isAtLeastMedium
+
+enum class CustomizeExportLayoutType {
+    Compact,
+    Medium,
+    Spatial,
+}
+
+@Composable
+fun calculateLayoutType(enableXr: Boolean = false): CustomizeExportLayoutType {
+    return when {
+        LocalSpatialCapabilities.current.isSpatialUiEnabled && enableXr -> CustomizeExportLayoutType.Spatial
+        isAtLeastMedium() -> CustomizeExportLayoutType.Medium
+        else -> CustomizeExportLayoutType.Compact
+    }
+}