Merge "Clean up forked collectAsStateWithLifecycle" (bda1edbb) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/spa/app/appinfo/AppAllServicesPreference.kt

+3 −1

Original line number	Diff line number	Diff line
		@@ -28,8 +28,9 @@ import androidx.compose.runtime.remember
		import androidx.compose.runtime.rememberCoroutineScope
		import androidx.compose.ui.platform.LocalContext
		import androidx.compose.ui.res.stringResource
		import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
		import androidx.lifecycle.compose.collectAsStateWithLifecycle
		import com.android.settings.R
		import com.android.settingslib.spa.framework.compose.collectAsStateWithLifecycle
		import com.android.settingslib.spa.widget.preference.Preference
		import com.android.settingslib.spa.widget.preference.PreferenceModel
		import com.android.settingslib.spaprivileged.model.app.resolveActionForApp
		@@ -45,6 +46,7 @@ import kotlinx.coroutines.flow.shareIn
		import kotlinx.coroutines.launch
		import kotlinx.coroutines.plus

		@OptIn(ExperimentalLifecycleComposeApi::class)
		@Composable
		fun AppAllServicesPreference(app: ApplicationInfo) {
		val context = LocalContext.current

+3 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,8 @@ import androidx.compose.runtime.Composable
		import androidx.compose.runtime.remember
		import androidx.compose.ui.platform.LocalContext
		import androidx.compose.ui.res.stringResource
		import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
		import androidx.lifecycle.compose.collectAsStateWithLifecycle
		import com.android.settings.R
		import com.android.settings.Utils
		import com.android.settings.applications.appinfo.AppInfoDashboardFragment
		@@ -34,7 +36,6 @@ import com.android.settings.datausage.AppDataUsage
		import com.android.settings.datausage.DataUsageUtils
		import com.android.settingslib.net.NetworkCycleDataForUid
		import com.android.settingslib.net.NetworkCycleDataForUidLoader
		import com.android.settingslib.spa.framework.compose.collectAsStateWithLifecycle
		import com.android.settingslib.spa.framework.compose.toState
		import com.android.settingslib.spa.widget.preference.Preference
		import com.android.settingslib.spa.widget.preference.PreferenceModel
		@@ -43,6 +44,7 @@ import kotlinx.coroutines.Dispatchers
		import kotlinx.coroutines.flow.flow
		import kotlinx.coroutines.withContext

		@OptIn(ExperimentalLifecycleComposeApi::class)
		@Composable
		fun AppDataUsagePreference(app: ApplicationInfo) {
		val context = LocalContext.current

+3 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,8 @@ import com.android.settings.R
		import com.android.settings.Utils
		import com.android.settings.applications.AppStoreUtil
		import com.android.settingslib.applications.AppUtils
		import com.android.settingslib.spa.framework.compose.collectAsStateWithLifecycle
		import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
		import androidx.lifecycle.compose.collectAsStateWithLifecycle
		import com.android.settingslib.spa.widget.preference.Preference
		import com.android.settingslib.spa.widget.preference.PreferenceModel
		import com.android.settingslib.spaprivileged.framework.common.asUser
		@@ -44,6 +45,7 @@ import kotlinx.coroutines.flow.shareIn
		import kotlinx.coroutines.launch
		import kotlinx.coroutines.withContext

		@OptIn(ExperimentalLifecycleComposeApi::class)
		@Composable
		fun AppInstallerInfoPreference(app: ApplicationInfo) {
		val context = LocalContext.current

+3 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,8 @@ import com.android.settings.applications.AppInfoBase
		import com.android.settings.applications.AppLocaleUtil
		import com.android.settings.applications.appinfo.AppLocaleDetails
		import com.android.settings.localepicker.AppLocalePickerActivity
		import com.android.settingslib.spa.framework.compose.collectAsStateWithLifecycle
		import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
		import androidx.lifecycle.compose.collectAsStateWithLifecycle
		import com.android.settingslib.spa.widget.preference.Preference
		import com.android.settingslib.spa.widget.preference.PreferenceModel
		import com.android.settingslib.spaprivileged.model.app.userHandle
		@@ -40,6 +41,7 @@ import kotlinx.coroutines.Dispatchers
		import kotlinx.coroutines.flow.flow
		import kotlinx.coroutines.withContext

		@OptIn(ExperimentalLifecycleComposeApi::class)
		@Composable
		fun AppLocalePreference(app: ApplicationInfo) {
		val context = LocalContext.current

+3 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,8 @@ import androidx.compose.ui.platform.LocalContext
		import androidx.compose.ui.res.stringResource
		import com.android.settings.R
		import com.android.settings.overlay.FeatureFactory
		import com.android.settingslib.spa.framework.compose.collectAsStateWithLifecycle
		import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
		import androidx.lifecycle.compose.collectAsStateWithLifecycle
		import com.android.settingslib.spa.widget.preference.Preference
		import com.android.settingslib.spa.widget.preference.PreferenceModel
		import com.android.settingslib.spaprivileged.model.app.resolveActionForApp
		@@ -43,6 +44,7 @@ import kotlinx.coroutines.flow.shareIn
		import kotlinx.coroutines.launch
		import kotlinx.coroutines.plus

		@OptIn(ExperimentalLifecycleComposeApi::class)
		@Composable
		fun AppSettingsPreference(app: ApplicationInfo) {
		val context = LocalContext.current