PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid empty line for storage summary" into main

Browse Source
This commit is contained in:
Chaohui Wang
2024-01-19 03:06:14 +00:00
committed by Android (Google) Code Review
parent 7bc4ea01d1 ca0542d2d7
commit 739f6ff69a
2 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/spa/app/AllAppList.kt
View File

@@ -34,6 +34,7 @@ import com.android.settingslib.spa.framework.util.mapItem
import com.android.settingslib.spa.widget.preference.Preference
import com.android.settingslib.spa.widget.preference.PreferenceModel
import com.android.settingslib.spa.widget.ui.SpinnerOption
import com.android.settingslib.spaprivileged.framework.compose.getPlaceholder
import com.android.settingslib.spaprivileged.model.app.AppListModel
import com.android.settingslib.spaprivileged.model.app.AppRecord
import com.android.settingslib.spaprivileged.model.app.installed
@@ -131,7 +132,11 @@ class AllAppListModel(
override fun getSummary(option: Int, record: AppRecordWithSize): () -> String {
val storageSummary = record.app.getStorageSummary()
return {
val summaryList = mutableListOf(storageSummary.value)
val summaryList = mutableListOf<String>()
val storageSummaryValue = storageSummary.value
if (storageSummaryValue.isNotBlank()) {
summaryList += storageSummaryValue
}
when {
!record.app.installed && !record.app.isArchived -> {
summaryList += context.getString(R.string.not_installed)
@@ -142,6 +147,7 @@ class AllAppListModel(
}
}
summaryList.joinToString(separator = System.lineSeparator())
.ifEmpty { context.getPlaceholder() } // Use placeholder to reduce flaky
}
}