Merge pull request #85 from Android-PowerUser/Test

Test

Author: Android-PowerUser

.github/workflows/manual.yml

@@ -144,27 +144,27 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
 
-    - name: Build app module (debug)
+    - name: Build app module (release)
       if: env.BUILD_APP == 'true'
-      run: ./gradlew :app:assembleDebug
+      run: ./gradlew :app:assembleRelease
 
-    - name: Build humanoperator module (debug)
+    - name: Build humanoperator module (release)
       if: env.BUILD_HUMANOPERATOR == 'true'
-      run: ./gradlew :humanoperator:assembleDebug
+      run: ./gradlew :humanoperator:assembleRelease
 
     - name: Upload app APK
       if: env.BUILD_APP == 'true'
       uses: actions/upload-artifact@v4
       with:
-        name: app-debug
-        path: app/build/outputs/apk/debug/app-debug.apk
+        name: app-release-unsigned
+        path: app/build/outputs/apk/release/app-release-unsigned.apk
 
     - name: Upload humanoperator APK
       if: env.BUILD_HUMANOPERATOR == 'true'
       uses: actions/upload-artifact@v4
       with:
-        name: humanoperator-debug
-        path: humanoperator/build/outputs/apk/debug/humanoperator-debug.apk
+        name: humanoperator-release-unsigned
+        path: humanoperator/build/outputs/apk/release/humanoperator-release-unsigned.apk
 
     - name: Build summary
       run: |

app/build.gradle.kts

@@ -35,8 +35,15 @@ android {
     }
 
     buildTypes {
+        getByName("debug") {
+            isDebuggable = true
+        }
+        getByName("release") {
+            isDebuggable = false
+        }
         create("samples") {
             initWith(getByName("debug"))
+            isDebuggable = false
         }
     }
 

app/src/main/kotlin/com/google/ai/sample/feature/multimodal/PhotoReasoningViewModel.kt

@@ -134,7 +134,6 @@ class PhotoReasoningViewModel(
 
     // Keep track of the current user input
     private var currentUserInput: String = ""
-    private var latestUserTaskInput: String = ""
 
     // Observable state for the input field to persist across configuration changes
     private val _userInput = MutableStateFlow("")
@@ -791,10 +790,6 @@ class PhotoReasoningViewModel(
         imageUrisForChat: List<String>? = null
     ) {
         val currentModel = com.google.ai.sample.GenerativeAiViewModelFactory.getCurrentModel()
-        if (userInput.isNotBlank() && screenInfoForPrompt.isNullOrBlank()) {
-            latestUserTaskInput = userInput.trim()
-        }
-
         clearStaleErrorState()
         stopExecutionFlag.set(false)
 
@@ -2167,12 +2162,6 @@ class PhotoReasoningViewModel(
     }
 
     private fun createGenericScreenshotPrompt(): String {
-        val latestTask = latestUserTaskInput.trim()
-        if (latestTask.isNotBlank()) {
-            latestUserTaskInput = ""
-            return latestTask
-        }
-
         return ""
     }
 

app/src/main/res/xml/data_extraction_rules.xml

@@ -21,12 +21,8 @@
 <data-extraction-rules>
     <cloud-backup>
         <include domain="sharedpref" path="."/>
-        <exclude domain="file" path="no_backup/"/>
-        <exclude domain="database" path="."/>
     </cloud-backup>
     <device-transfer>
         <include domain="sharedpref" path="."/>
-        <exclude domain="file" path="no_backup/"/>
-        <exclude domain="database" path="."/>
     </device-transfer>
 </data-extraction-rules>