- Use camerax to implement image capture in-app instead of using the native camera app to reduce the possibility of app being killed due to GPU OOM.

- Show accelerator name in chat message sender labels.
- Attach download workers with silent foreground notifications to make them less likely to be killed.
- Update app icon to be consistent with Google style.
- Bump up version to 1.0.2.

Author: jinjingforever

Android/src/app/build.gradle.kts

@@ -31,7 +31,7 @@ android {
     minSdk = 26
     targetSdk = 35
     versionCode = 1
-    versionName = "1.0.1"
+    versionName = "1.0.2"
 
     // Needed for HuggingFace auth workflows.
     manifestPlaceholders["appAuthRedirectScheme"] = "com.google.ai.edge.gallery.oauth"

Android/src/app/src/main/AndroidManifest.xml

@@ -18,8 +18,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>-->
-<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>-->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.CAMERA" />
@@ -83,11 +83,12 @@
                 android:resource="@xml/file_paths" />
         </provider>
 
-<!--        <service-->
-<!--            android:name=".GalleryService"-->
-<!--            android:foregroundServiceType="dataSync"-->
-<!--            android:exported="false">-->
-<!--        </service>-->
+        <service
+            android:name="androidx.work.impl.foreground.SystemForegroundService"
+            android:foregroundServiceType="dataSync"
+            android:exported="false"
+            tools:node="merge">
+        </service>
     </application>
 
 </manifest>

Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Consts.kt

@@ -18,6 +18,7 @@ package com.google.ai.edge.gallery.data
 
 // Keys used to send/receive data to Work.
 const val KEY_MODEL_URL = "KEY_MODEL_URL"
+const val KEY_MODEL_NAME = "KEY_MODEL_NAME"
 const val KEY_MODEL_VERSION = "KEY_MODEL_VERSION"
 const val KEY_MODEL_DOWNLOAD_MODEL_DIR = "KEY_MODEL_DOWNLOAD_MODEL_DIR"
 const val KEY_MODEL_DOWNLOAD_FILE_NAME = "KEY_MODEL_DOWNLOAD_FILE_NAME"

Android/src/app/src/main/java/com/google/ai/edge/gallery/data/DownloadRepository.kt

@@ -24,7 +24,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
-import android.os.Build
 import android.util.Log
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
@@ -92,7 +91,8 @@ class DefaultDownloadRepository(
     val builder = Data.Builder()
     val totalBytes = model.totalBytes + model.extraDataFiles.sumOf { it.sizeInBytes }
     val inputDataBuilder =
-      builder.putString(KEY_MODEL_URL, model.url).putString(KEY_MODEL_VERSION, model.version)
+      builder.putString(KEY_MODEL_NAME, model.name).putString(KEY_MODEL_URL, model.url)
+        .putString(KEY_MODEL_VERSION, model.version)
         .putString(KEY_MODEL_DOWNLOAD_MODEL_DIR, model.normalizedName)
         .putString(KEY_MODEL_DOWNLOAD_FILE_NAME, model.downloadFileName)
         .putBoolean(KEY_MODEL_IS_ZIP, model.isZip).putString(KEY_MODEL_UNZIPPED_DIR, model.unzipDir)
@@ -271,13 +271,11 @@ class DefaultDownloadRepository(
 
     // Create the NotificationChannel, but only on API 26+ because
     // the NotificationChannel class is new and not in the support library
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      val importance = NotificationManager.IMPORTANCE_HIGH
-      val channel = NotificationChannel(channelId, channelName, importance)
-      val notificationManager: NotificationManager =
-        context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-      notificationManager.createNotificationChannel(channel)
-    }
+    val importance = NotificationManager.IMPORTANCE_HIGH
+    val channel = NotificationChannel(channelId, channelName, importance)
+    val notificationManager: NotificationManager =
+      context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+    notificationManager.createNotificationChannel(channel)
 
     // Create an Intent to open your app with a deep link.
     val intent = Intent(

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

@@ -44,15 +44,19 @@ data class Classification(val label: String, val score: Float, val color: Color)
 
 /** Base class for a chat message. */
 open class ChatMessage(
-  open val type: ChatMessageType, open val side: ChatSide, open val latencyMs: Float = -1f
+  open val type: ChatMessageType,
+  open val side: ChatSide,
+  open val latencyMs: Float = -1f,
+  open val accelerator: String = "",
 ) {
   open fun clone(): ChatMessage {
     return ChatMessage(type = type, side = side, latencyMs = latencyMs)
   }
 }
 
 /** Chat message for showing loading status. */
-class ChatMessageLoading : ChatMessage(type = ChatMessageType.LOADING, side = ChatSide.AGENT)
+class ChatMessageLoading(override val accelerator: String = "") :
+  ChatMessage(type = ChatMessageType.LOADING, side = ChatSide.AGENT, accelerator = accelerator)
 
 /** Chat message for info (help). */
 class ChatMessageInfo(val content: String) :
@@ -79,12 +83,19 @@ open class ChatMessageText(
 
   // Benchmark result for LLM response.
   var llmBenchmarkResult: ChatMessageBenchmarkLlmResult? = null,
-) : ChatMessage(type = ChatMessageType.TEXT, side = side, latencyMs = latencyMs) {
+  override val accelerator: String = "",
+) : ChatMessage(
+  type = ChatMessageType.TEXT,
+  side = side,
+  latencyMs = latencyMs,
+  accelerator = accelerator
+) {
   override fun clone(): ChatMessageText {
     return ChatMessageText(
       content = content,
       side = side,
       latencyMs = latencyMs,
+      accelerator = accelerator,
       isMarkdown = isMarkdown,
       llmBenchmarkResult = llmBenchmarkResult,
     )
@@ -168,10 +179,12 @@ class ChatMessageBenchmarkLlmResult(
   val statValues: MutableMap<String, Float>,
   val running: Boolean,
   override val latencyMs: Float = 0f,
+  override val accelerator: String = "",
 ) : ChatMessage(
   type = ChatMessageType.BENCHMARK_LLM_RESULT,
   side = ChatSide.AGENT,
-  latencyMs = latencyMs
+  latencyMs = latencyMs,
+  accelerator = accelerator,
 )
 
 data class Histogram(

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

@@ -80,7 +80,6 @@ import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.google.ai.edge.gallery.R
-import com.google.ai.edge.gallery.data.ConfigKey
 import com.google.ai.edge.gallery.data.Model
 import com.google.ai.edge.gallery.data.Task
 import com.google.ai.edge.gallery.data.TaskType
@@ -266,9 +265,13 @@ fun ChatPanel(
             horizontalAlignment = hAlign,
           ) messageColumn@{
             // Sender row.
+            var agentName = stringResource(task.agentNameRes)
+            if (message.accelerator.isNotEmpty()) {
+              agentName = "$agentName on ${message.accelerator}"
+            }
             MessageSender(
               message = message,
-              agentName = stringResource(task.agentNameRes),
+              agentName = agentName,
               imageHistoryCurIndex = imageHistoryCurIndex.intValue
             )
 

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

@@ -141,6 +141,7 @@ open class ChatViewModel(val task: Task) : ViewModel() {
           content = newContent,
           side = lastMessage.side,
           latencyMs = latencyMs,
+          accelerator = lastMessage.accelerator,
         )
         newMessages.removeAt(newMessages.size - 1)
         newMessages.add(newLastMessage)