From 24004592cc9f9c0103236d13be4b74100c2964b0 Mon Sep 17 00:00:00 2001
From: Mark Kim <markvk@google.com>
Date: Tue, 17 Oct 2023 15:40:11 +0000
Subject: [PATCH] Do not show "Not installed for this user" summary for
 archived app

Test: AllAppListTest

Bug: 304255511
Change-Id: I806fed91d4716e8e21f70ec1ad8572f246c7f031
---
 src/com/android/settings/spa/app/AllAppList.kt  |  2 +-
 .../android/settings/spa/app/AllAppListTest.kt  | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/spa/app/AllAppList.kt b/src/com/android/settings/spa/app/AllAppList.kt
index f3ad2e61b62..383a0e8ea2e 100644
--- a/src/com/android/settings/spa/app/AllAppList.kt
+++ b/src/com/android/settings/spa/app/AllAppList.kt
@@ -136,7 +136,7 @@ class AllAppListModel(
             derivedStateOf {
                 storageSummary.value +
                     when {
-                        !record.app.installed -> {
+                        !record.app.installed && !record.app.isArchived -> {
                             System.lineSeparator() + context.getString(R.string.not_installed)
                         }
                         isDisabled(record) -> {
diff --git a/tests/spa_unit/src/com/android/settings/spa/app/AllAppListTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/AllAppListTest.kt
index fe7c6a2a6f6..53ed4f0da9a 100644
--- a/tests/spa_unit/src/com/android/settings/spa/app/AllAppListTest.kt
+++ b/tests/spa_unit/src/com/android/settings/spa/app/AllAppListTest.kt
@@ -216,6 +216,23 @@ class AllAppListTest {
         composeTestRule.onNodeWithText(LABEL).assertIsDisplayed()
     }
 
+    @Test
+    fun allAppListModel_getSummaryWhenArchived() {
+        val listModel = AllAppListModel(context) { stateOf(SUMMARY) }
+        val archivedApp = ApplicationInfo().apply {
+            packageName = PACKAGE_NAME
+            isArchived = true
+        }
+
+        lateinit var summaryState: State<String>
+        composeTestRule.setContent {
+            summaryState =
+                listModel.getSummary(option = 0, record = AppRecordWithSize(app = archivedApp))
+        }
+
+        assertThat(summaryState.value).isEqualTo(SUMMARY)
+    }
+
     private fun getAppListInput(): AppListInput<AppRecordWithSize> {
         lateinit var input: AppListInput<AppRecordWithSize>
         composeTestRule.setContent {