Merge branch 'main' into feature/xr/customize-screen

devbridie · devbridie · commit f67707876369 · 2025-09-22T14:43:22.000+02:00
diff --git a/.google/packaging.yaml b/.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
diff --git a/core/testing/src/main/java/com/android/developers/testing/repository/FakeWatchFaceInstallationRepository.kt b/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() {
diff --git a/feature/results/src/androidTest/java/com/android/developers/androidify/results/ResultsScreenTest.kt b/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 {
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt
@@ -71,6 +71,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation3.ui.LocalNavAnimatedContentScope
+import com.android.developers.androidify.customize.watchface.WatchFaceModalSheet
 import com.android.developers.androidify.customize.xr.CustomizeExportLayoutSpatial
 import com.android.developers.androidify.results.PermissionRationaleDialog
 import com.android.developers.androidify.results.R
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
@@ -24,6 +24,7 @@ import androidx.compose.ui.Modifier
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
 import com.android.developers.androidify.RemoteConfigDataSource
+import com.android.developers.androidify.customize.watchface.WatchFaceSelectionState
 import com.android.developers.androidify.data.ImageGenerationRepository
 import com.android.developers.androidify.util.LocalFileProvider
 import com.android.developers.androidify.watchface.WatchFaceAsset
@@ -34,6 +35,7 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted.Companion.WhileSubscribed
@@ -367,10 +369,11 @@ class CustomizeExportViewModel @AssistedInject constructor(
 
     fun installWatchFace() {
         val watchFaceToInstall = _state.value.watchFaceSelectionState.selectedWatchFace ?: return
-        transferJob = viewModelScope.launch {
-            val bitmap = state.value.exportImageCanvas.imageBitmap
-            val watch = state.value.connectedWatch
-            if (watch != null && bitmap != null) {
+        val bitmap = state.value.exportImageCanvas.imageBitmap
+        val watch = state.value.connectedWatch
+        if (watch != null && bitmap != null) {
+            transferJob = viewModelScope.launch(Dispatchers.Default) {
+                watchfaceInstallationRepository.prepareForTransfer()
                 val wfBitmap = imageGenerationRepository.removeBackground(bitmap)
                 val response = watchfaceInstallationRepository
                     .createAndTransferWatchFace(watch, watchFaceToInstall, wfBitmap)
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeState.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeState.kt
@@ -21,6 +21,7 @@ import androidx.annotation.DrawableRes
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
+import com.android.developers.androidify.customize.watchface.WatchFaceSelectionState
 import com.android.developers.androidify.wear.common.ConnectedWatch
 import com.android.developers.androidify.wear.common.WatchFaceInstallationStatus
 
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/AllDoneWatchFacePanel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/AllDoneWatchFacePanel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/ErrorWatchFacePanel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/ErrorWatchFacePanel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/GuidanceWatchFacePanel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/GuidanceWatchFacePanel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/InstallAndroidifyPanel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/InstallAndroidifyPanel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import android.content.Intent
 import androidx.compose.foundation.layout.Arrangement
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/InstallWatchFacePanel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/InstallWatchFacePanel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -115,12 +115,12 @@ private fun InstallWatchFacePanelPreview() {
 @Composable
 fun WatchFacesRow(
     watchFaces: List<WatchFaceAsset>,
+    modifier: Modifier = Modifier,
     selectedWatchFace: WatchFaceAsset? = null,
     onWatchFaceSelect: (WatchFaceAsset) -> Unit = {},
-    modifier: Modifier = Modifier,
 ) {
     LazyRow(
-        modifier = Modifier,
+        modifier = modifier,
         horizontalArrangement = Arrangement.spacedBy(8.dp),
         contentPadding = PaddingValues(horizontal = 8.dp),
     ) {
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/TransferringWatchFacePanel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/TransferringWatchFacePanel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -37,8 +37,9 @@ import com.android.developers.androidify.theme.AndroidifyTheme
 import com.android.developers.androidify.watchface.WatchFaceAsset
 
 @Composable
-fun SendingWatchFacePanel(
+fun TransferringWatchFacePanel(
     modifier: Modifier = Modifier,
+    transferLabel: String,
     selectedWatchFace: WatchFaceAsset?,
 ) {
     Column(
@@ -61,8 +62,8 @@ fun SendingWatchFacePanel(
         }
         Spacer(modifier = Modifier.height(24.dp))
         WatchFacePanelButton(
-            modifier = modifier.padding(horizontal = 16.dp),
-            buttonText = stringResource(R.string.sending_to_watch),
+            modifier = Modifier.padding(horizontal = 16.dp),
+            buttonText = transferLabel,
             isSending = true,
             colors = ButtonDefaults.buttonColors(
                 contentColor = MaterialTheme.colorScheme.onSurface,
@@ -81,8 +82,25 @@ private fun SendingWatchFacePanelPreview() {
         previewPath = R.drawable.watch_face_preview,
     )
     AndroidifyTheme {
-        SendingWatchFacePanel(
+        TransferringWatchFacePanel(
             selectedWatchFace = watchFace1,
+            transferLabel = stringResource(R.string.sending_to_watch),
+        )
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Preview(showBackground = true)
+@Composable
+private fun PreparingWatchFacePanelPreview() {
+    val watchFace1 = WatchFaceAsset(
+        id = "watch_face_1",
+        previewPath = R.drawable.watch_face_preview,
+    )
+    AndroidifyTheme {
+        TransferringWatchFacePanel(
+            selectedWatchFace = watchFace1,
+            transferLabel = stringResource(R.string.preparing_to_send),
         )
     }
 }
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFaceModalSheet.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFaceModalSheet.kt
@@ -13,13 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.ContentTransform
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -108,14 +111,21 @@ fun WatchFaceModalSheet(
                     AnimatedContent(
                         targetState = installationStatus,
                         transitionSpec = {
-                            ContentTransform(
-                                targetContentEnter = fadeIn(
-                                    animationSpec = tween(durationMillis = 500),
-                                ),
-                                initialContentExit = fadeOut(
-                                    animationSpec = tween(durationMillis = 500),
-                                ),
-                            )
+                            if (
+                                initialState is WatchFaceInstallationStatus.Preparing &&
+                                targetState is WatchFaceInstallationStatus.Sending
+                            ) {
+                                EnterTransition.None togetherWith ExitTransition.None
+                            } else {
+                                ContentTransform(
+                                    targetContentEnter = fadeIn(
+                                        animationSpec = tween(durationMillis = 500),
+                                    ),
+                                    initialContentExit = fadeOut(
+                                        animationSpec = tween(durationMillis = 500),
+                                    ),
+                                )
+                            }
                         },
                     ) { installationStatus ->
                         when (installationStatus) {
@@ -164,9 +174,17 @@ fun WatchFaceModalSheet(
                                 }
                             }
 
+                            is WatchFaceInstallationStatus.Preparing -> {
+                                TransferringWatchFacePanel(
+                                    selectedWatchFace = watchFaceSelectionState.selectedWatchFace,
+                                    transferLabel = stringResource(R.string.preparing_to_send),
+                                )
+                            }
+
                             is WatchFaceInstallationStatus.Sending -> {
-                                SendingWatchFacePanel(
+                                TransferringWatchFacePanel(
                                     selectedWatchFace = watchFaceSelectionState.selectedWatchFace,
+                                    transferLabel = stringResource(R.string.sending_to_watch),
                                 )
                             }
 
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFacePanelButton.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFacePanelButton.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.BorderStroke
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFacePreviewItem.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFacePreviewItem.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
@@ -31,7 +31,6 @@ import androidx.compose.ui.graphics.ColorMatrix
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import com.android.developers.androidify.watchface.R
 import com.android.developers.androidify.watchface.WatchFaceAsset
 
 @Composable
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFaceSelectionState.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFaceSelectionState.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import com.android.developers.androidify.watchface.WatchFaceAsset
 
diff --git a/feature/results/src/main/res/values/strings.xml b/feature/results/src/main/res/values/strings.xml
@@ -42,6 +42,7 @@
         <item>Hey good looking!</item>
     </string-array>
     <string name="send_to_watch">Send to watch</string>
+    <string name="preparing_to_send">Preparing…</string>
     <string name="sending_to_watch">Sending to watch…</string>
     <string name="watch_face_sent">Watch face sent</string>
     <string name="send_to_watch_device">%s detected.</string>
diff --git a/watchface/src/main/assets/androidanalogue/res/drawable/preview.png b/watchface/src/main/assets/androidanalogue/res/drawable/preview.png
diff --git a/watchface/src/main/assets/androidanalogue/res/drawable/res_9506934.png b/watchface/src/main/assets/androidanalogue/res/drawable/res_9506934.png
diff --git a/watchface/src/main/java/com/android/developers/androidify/watchface/di/WatchFaceModule.kt b/watchface/src/main/java/com/android/developers/androidify/watchface/di/WatchFaceModule.kt
@@ -70,7 +70,7 @@ class WatchFaceModule {
         remoteConfigDataSource: RemoteConfigDataSource,
     ): WatchFaceInstallationRepository {
         val watchFacesEnabled = remoteConfigDataSource.watchfaceFeatureEnabled()
-        return if (Build.VERSION.SDK_INT >= MIN_WATCH_FACE_SDK_VERSION && watchFacesEnabled) {
+        return if (Build.VERSION.SDK_INT >= MIN_WATCH_FACE_SDK_VERSION && watchFacesEnabled || true) {
             supportedImpl
         } else {
             noSupportImpl
diff --git a/watchface/src/main/java/com/android/developers/androidify/watchface/transfer/EmptyWatchFaceInstallationRepository.kt b/watchface/src/main/java/com/android/developers/androidify/watchface/transfer/EmptyWatchFaceInstallationRepository.kt
@@ -46,4 +46,6 @@ class EmptyWatchFaceInstallationRepositoryImpl @Inject constructor() : WatchFace
     }
 
     override suspend fun resetInstallationStatus() { }
+
+    override suspend fun prepareForTransfer() { }
 }
diff --git a/watchface/src/main/java/com/android/developers/androidify/watchface/transfer/WatchFaceInstallationRepository.kt b/watchface/src/main/java/com/android/developers/androidify/watchface/transfer/WatchFaceInstallationRepository.kt
@@ -68,6 +68,8 @@ interface WatchFaceInstallationRepository {
     suspend fun getAvailableWatchFaces(): Result<List<WatchFaceAsset>>
 
     suspend fun resetInstallationStatus()
+
+    suspend fun prepareForTransfer()
 }
 
 class WatchFaceInstallationRepositoryImpl @Inject constructor(
@@ -127,4 +129,8 @@ class WatchFaceInstallationRepositoryImpl @Inject constructor(
         wearAssetTransmitter.resetTransferId()
         manualStatusUpdates.tryEmit(WatchFaceInstallationStatus.NotStarted)
     }
+
+    override suspend fun prepareForTransfer() {
+        manualStatusUpdates.tryEmit(WatchFaceInstallationStatus.Preparing)
+    }
 }
diff --git a/wear/common/src/main/java/com/android/developers/androidify/wear/common/WatchFaceInstallationStatus.kt b/wear/common/src/main/java/com/android/developers/androidify/wear/common/WatchFaceInstallationStatus.kt
@@ -44,6 +44,9 @@ sealed class WatchFaceInstallationStatus() {
         val validationToken: String,
         val activationStrategy: WatchFaceActivationStrategy,
     ) : WatchFaceInstallationStatus()
+
+    object Preparing: WatchFaceInstallationStatus()
+
     object Sending : WatchFaceInstallationStatus()
 
     @Serializable
diff --git a/wear/src/main/java/com/android/developers/androidify/ui/WatchFaceOnboardingScreen.kt b/wear/src/main/java/com/android/developers/androidify/ui/WatchFaceOnboardingScreen.kt
@@ -49,6 +49,7 @@ fun WatchFaceOnboardingScreen(
 
         when (state) {
             is WatchFaceInstallationStatus.Receiving,
+            is WatchFaceInstallationStatus.Preparing,
             is WatchFaceInstallationStatus.Sending,
             -> {
                 TransmissionScreen()
