internal changes

PiperOrigin-RevId: 892451439

Author: Google AI Edge Gallery

Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/DownloadAndTryButton.kt

@@ -93,6 +93,9 @@ import kotlinx.coroutines.withContext
 private const val TAG = "AGDownloadAndTryButton"
 private const val SYSTEM_RESERVED_MEMORY_IN_BYTES = 3 * (1L shl 30)
 
+private val MODEL_NAMES_TO_SHOW_GEMMA_LICENSES =
+  setOf("Gemma-3n-E2B-it", "Gemma-3n-E4B-it", "Gemma3-1B-IT")
+
 /**
  * Handles the "Download & Try it" button click, managing the model download process based on
  * various conditions.
@@ -372,6 +375,7 @@ fun DownloadAndTryButton(
         // Check TOS before downloading.
         if (
           model.url.startsWith("https://dl.google.com/google-ai-edge-gallery/") &&
+            MODEL_NAMES_TO_SHOW_GEMMA_LICENSES.contains(model.name) &&
             !tosViewModel.getIsGemmaTermsOfUseAccepted()
         ) {
           showGemmaTermsOfUseDialog = true

Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatPanel.kt

@@ -23,6 +23,8 @@ import androidx.compose.animation.core.VisibilityThreshold
 import androidx.compose.animation.core.spring
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
 import androidx.compose.animation.slideInVertically
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -78,21 +80,22 @@ import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import com.google.ai.edge.gallery.R
 import com.google.ai.edge.gallery.data.BuiltInTaskId
 import com.google.ai.edge.gallery.data.Model
 import com.google.ai.edge.gallery.data.Task
 import com.google.ai.edge.gallery.ui.common.AudioAnimation
 import com.google.ai.edge.gallery.ui.common.ErrorDialog
 import com.google.ai.edge.gallery.ui.common.FloatingBanner
+import com.google.ai.edge.gallery.ui.common.RotationalLoader
 import com.google.ai.edge.gallery.ui.modelmanager.ModelInitializationStatusType
 import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
 import com.google.ai.edge.gallery.ui.theme.customColors
-import com.google.ai.edge.gallery.ui.theme.emptyStateContent
-import com.google.ai.edge.gallery.ui.theme.emptyStateTitle
 import kotlinx.coroutines.delay
 
 /** Composable function for the main chat panel, displaying messages and handling user input. */
@@ -483,30 +486,44 @@ fun ChatPanel(
 
         // Show empty state.
         if (messages.isEmpty() && pickedImagesCount == 0 && pickedAudioClipsCount == 0) {
-          if (
-            modelInitializationStatus?.status == ModelInitializationStatusType.INITIALIZING &&
-              modelInitializationStatus.isFirstInitialization(selectedModel)
+          emptyStateComposable(selectedModel)
+        }
+        // Loading screen when model is initialized for that first time.
+        val isFirstInitializing =
+          modelInitializationStatus?.status == ModelInitializationStatusType.INITIALIZING &&
+            modelInitializationStatus.isFirstInitialization(selectedModel)
+        Column(
+          horizontalAlignment = Alignment.CenterHorizontally,
+          verticalArrangement = Arrangement.Center,
+        ) {
+          AnimatedVisibility(
+            isFirstInitializing,
+            enter = fadeIn() + scaleIn(initialScale = 0.9f),
+            exit = fadeOut() + scaleOut(targetScale = 0.9f),
           ) {
-            Box(modifier = Modifier.fillMaxSize()) {
+            Box(modifier = Modifier.background(MaterialTheme.colorScheme.surface).fillMaxSize()) {
               Column(
-                modifier =
-                  Modifier.align(Alignment.Center)
-                    .padding(horizontal = 48.dp)
-                    .padding(bottom = 48.dp),
+                modifier = Modifier.align(Alignment.Center),
                 horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.spacedBy(12.dp),
+                verticalArrangement = Arrangement.spacedBy(8.dp),
               ) {
-                Text(stringResource(R.string.aichat_initializing_title), style = emptyStateTitle)
+                RotationalLoader(size = 32.dp)
+                Text(
+                  stringResource(R.string.aichat_initializing_title),
+                  style =
+                    MaterialTheme.typography.headlineLarge.copy(
+                      fontSize = 24.sp,
+                      fontWeight = FontWeight.Bold,
+                    ),
+                )
                 Text(
                   stringResource(R.string.aichat_initializing_content),
-                  style = emptyStateContent,
+                  style = MaterialTheme.typography.bodyMedium,
                   color = MaterialTheme.colorScheme.onSurfaceVariant,
                   textAlign = TextAlign.Center,
                 )
               }
             }
-          } else {
-            emptyStateComposable(selectedModel)
           }
         }
       }

Android/src/app/src/main/res/values/strings.xml

@@ -18,6 +18,7 @@
   <!-- TODO(jingjin): Add translation support when i18n is ready. -->
   <string name="all" translatable="false">All</string>
   <string name="add" translatable="false">Add</string>
+  <string name="added" translatable="false">Added</string>
   <string name="add_audio" translatable="false">+Audio</string>
   <string name="aichat_emptystate_title" translatable="false">AI Chat</string>
   <string name="aichat_emptystate_content" translatable="false">Chat with on-device large language models</string>