From 33beb69e332410bc123f3e1eb7d55346d3527441 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Wed, 30 Nov 2022 15:55:16 +0800 Subject: [PATCH] Clean up AllAppListModel.filter Since it is same as default. Bug: 260660819 Test: Make Settings Change-Id: I7eab8843f44a3457805512bab0d8cb02e9427ca4 --- src/com/android/settings/spa/app/AllAppList.kt | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/com/android/settings/spa/app/AllAppList.kt b/src/com/android/settings/spa/app/AllAppList.kt index f8c5c0f63e9..75b5cd21963 100644 --- a/src/com/android/settings/spa/app/AllAppList.kt +++ b/src/com/android/settings/spa/app/AllAppList.kt @@ -27,7 +27,7 @@ import com.android.settingslib.spa.framework.common.SettingsEntryBuilder import com.android.settingslib.spa.framework.common.SettingsPage import com.android.settingslib.spa.framework.common.SettingsPageProvider import com.android.settingslib.spa.framework.compose.navigator -import com.android.settingslib.spa.framework.util.asyncMapItem +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.spaprivileged.model.app.AppListModel @@ -78,15 +78,7 @@ data class AppRecordWithSize( private class AllAppListModel : AppListModel { override fun transform(userIdFlow: Flow, appListFlow: Flow>) = - appListFlow.asyncMapItem { app -> - AppRecordWithSize(app) - } - - override fun filter( - userIdFlow: Flow, - option: Int, - recordListFlow: Flow>, - ) = recordListFlow + appListFlow.mapItem(::AppRecordWithSize) @Composable override fun getSummary(option: Int, record: AppRecordWithSize) = record.app.getStorageSize()