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

Remove ExperimentalLifecycleComposeApi

Browse Source 
Fix: 276310170
Bug: 271609607
Test: m Settings
Change-Id: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
Merged-In: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
(cherry picked from commit 8d220f0641)
(cherry picked from commit 2910d68343)
This commit is contained in:
Chaohui Wang
2023-04-12 08:55:55 +08:00
committed by Anvesh Renikindi
parent f72a53a595
commit f1febf9e9b
16 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/spa/app/appinfo/AppAllServicesPreference.kt
View File

@@ -28,7 +28,6 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.settings.R import com.android.settings.R
import com.android.settingslib.spa.widget.preference.Preference import com.android.settingslib.spa.widget.preference.Preference
@@ -46,7 +45,6 @@ import kotlinx.coroutines.flow.shareIn
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.plus import kotlinx.coroutines.plus
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable @Composable
fun AppAllServicesPreference(app: ApplicationInfo) { fun AppAllServicesPreference(app: ApplicationInfo) {
val context = LocalContext.current val context = LocalContext.current

2
src/com/android/settings/spa/app/appinfo/AppButtons.kt
View File

@@ -19,7 +19,6 @@ package com.android.settings.spa.app.appinfo
import android.content.pm.ApplicationInfo import android.content.pm.ApplicationInfo
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.settingslib.applications.AppUtils import com.android.settingslib.applications.AppUtils
import com.android.settingslib.spa.widget.button.ActionButton import com.android.settingslib.spa.widget.button.ActionButton
@@ -43,7 +42,6 @@ private class AppButtonsPresenter(private val packageInfoPresenter: PackageInfoP
private val appClearButton = AppClearButton(packageInfoPresenter) private val appClearButton = AppClearButton(packageInfoPresenter)
private val appForceStopButton = AppForceStopButton(packageInfoPresenter) private val appForceStopButton = AppForceStopButton(packageInfoPresenter)
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable @Composable
fun getActionButtons() = fun getActionButtons() =
packageInfoPresenter.flow.collectAsStateWithLifecycle(initialValue = null).value?.let { packageInfoPresenter.flow.collectAsStateWithLifecycle(initialValue = null).value?.let {

2
src/com/android/settings/spa/app/appinfo/AppDataUsagePreference.kt
View File

@@ -27,7 +27,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.settings.R import com.android.settings.R
import com.android.settings.Utils import com.android.settings.Utils
@@ -44,7 +43,6 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable @Composable
fun AppDataUsagePreference(app: ApplicationInfo) { fun AppDataUsagePreference(app: ApplicationInfo) {
val context = LocalContext.current val context = LocalContext.current

2
src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
View File

@@ -27,7 +27,6 @@ import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.NavType import androidx.navigation.NavType
import androidx.navigation.navArgument import androidx.navigation.navArgument
@@ -114,7 +113,6 @@ object AppInfoSettingsProvider : SettingsPageProvider {
} }
} }
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable @Composable
private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) { private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {
LifecycleEffect(onStart = { packageInfoPresenter.reloadPackageInfo() }) LifecycleEffect(onStart = { packageInfoPresenter.reloadPackageInfo() })

2
src/com/android/settings/spa/app/appinfo/AppInstallerInfoPreference.kt
View File

@@ -27,7 +27,6 @@ import com.android.settings.R
import com.android.settings.Utils import com.android.settings.Utils
import com.android.settings.applications.AppStoreUtil import com.android.settings.applications.AppStoreUtil
import com.android.settingslib.applications.AppUtils import com.android.settingslib.applications.AppUtils
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.settingslib.spa.widget.preference.Preference import com.android.settingslib.spa.widget.preference.Preference
import com.android.settingslib.spa.widget.preference.PreferenceModel import com.android.settingslib.spa.widget.preference.PreferenceModel
@@ -45,7 +44,6 @@ import kotlinx.coroutines.flow.shareIn
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable @Composable
fun AppInstallerInfoPreference(app: ApplicationInfo) { fun AppInstallerInfoPreference(app: ApplicationInfo) {
val context = LocalContext.current val context = LocalContext.current

2
src/com/android/settings/spa/app/appinfo/AppLocalePreference.kt
View File

@@ -31,7 +31,6 @@ import com.android.settings.applications.AppInfoBase
import com.android.settings.applications.AppLocaleUtil import com.android.settings.applications.AppLocaleUtil
import com.android.settings.applications.appinfo.AppLocaleDetails import com.android.settings.applications.appinfo.AppLocaleDetails
import com.android.settings.localepicker.AppLocalePickerActivity import com.android.settings.localepicker.AppLocalePickerActivity
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.settingslib.spa.widget.preference.Preference import com.android.settingslib.spa.widget.preference.Preference
import com.android.settingslib.spa.widget.preference.PreferenceModel import com.android.settingslib.spa.widget.preference.PreferenceModel
@@ -41,7 +40,6 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable @Composable
fun AppLocalePreference(app: ApplicationInfo) { fun AppLocalePreference(app: ApplicationInfo) {
val context = LocalContext.current val context = LocalContext.current

2
src/com/android/settings/spa/app/appinfo/AppNotificationPreference.kt
View File

@@ -22,7 +22,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.settings.R import com.android.settings.R
import com.android.settings.applications.appinfo.AppInfoDashboardFragment import com.android.settings.applications.appinfo.AppInfoDashboardFragment
@@ -38,7 +37,6 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.flowOn
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable @Composable
fun AppNotificationPreference( fun AppNotificationPreference(
app: ApplicationInfo, app: ApplicationInfo,

2
src/com/android/settings/spa/app/appinfo/AppOpenByDefaultPreference.kt
View File

@@ -22,7 +22,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.settings.R import com.android.settings.R
import com.android.settings.applications.appinfo.AppInfoDashboardFragment import com.android.settings.applications.appinfo.AppInfoDashboardFragment
@@ -41,7 +40,6 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.flowOn
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable @Composable
fun AppOpenByDefaultPreference(app: ApplicationInfo) { fun AppOpenByDefaultPreference(app: ApplicationInfo) {
val context = LocalContext.current val context = LocalContext.current

2
src/com/android/settings/spa/app/appinfo/AppSettingsPreference.kt
View File

@@ -28,7 +28,6 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import com.android.settings.R import com.android.settings.R
import com.android.settings.overlay.FeatureFactory import com.android.settings.overlay.FeatureFactory
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.settingslib.spa.widget.preference.Preference import com.android.settingslib.spa.widget.preference.Preference
import com.android.settingslib.spa.widget.preference.PreferenceModel import com.android.settingslib.spa.widget.preference.PreferenceModel
@@ -44,7 +43,6 @@ import kotlinx.coroutines.flow.shareIn
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.plus import kotlinx.coroutines.plus
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable @Composable
fun AppSettingsPreference(app: ApplicationInfo) { fun AppSettingsPreference(app: ApplicationInfo) {
val context = LocalContext.current val context = LocalContext.current

2
src/com/android/settings/spa/app/appinfo/CloneAppInfoSettings.kt
View File

@@ -23,7 +23,6 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.NavType import androidx.navigation.NavType
import androidx.navigation.navArgument import androidx.navigation.navArgument
@@ -69,7 +68,6 @@ object CloneAppInfoSettingsProvider : SettingsPageProvider {
fun getRoute(packageName: String, userId: Int): String = "$name/$packageName/$userId" fun getRoute(packageName: String, userId: Int): String = "$name/$packageName/$userId"
} }
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable @Composable
private fun CloneAppInfoSettings(packageInfoPresenter: PackageInfoPresenter) { private fun CloneAppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {
LifecycleEffect(onStart = { packageInfoPresenter.reloadPackageInfo() }) LifecycleEffect(onStart = { packageInfoPresenter.reloadPackageInfo() })

2
src/com/android/settings/spa/app/appinfo/ClonePageAppButtons.kt
View File

@@ -22,7 +22,6 @@ import androidx.compose.material.icons.outlined.Launch
import androidx.compose.material.icons.outlined.WarningAmber import androidx.compose.material.icons.outlined.WarningAmber
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.settings.R import com.android.settings.R
import com.android.settingslib.spa.widget.button.ActionButton import com.android.settingslib.spa.widget.button.ActionButton
@@ -39,7 +38,6 @@ private class CloneAppButtonsPresenter(private val packageInfoPresenter: Package
private val appCreateButton = AppCreateButton(packageInfoPresenter) private val appCreateButton = AppCreateButton(packageInfoPresenter)
private val appForceStopButton = FakeAppForceStopButton(packageInfoPresenter) private val appForceStopButton = FakeAppForceStopButton(packageInfoPresenter)
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable @Composable
fun getActionButtons() = fun getActionButtons() =
packageInfoPresenter.flow.collectAsStateWithLifecycle(initialValue = null).value?.let { packageInfoPresenter.flow.collectAsStateWithLifecycle(initialValue = null).value?.let {

2
src/com/android/settings/spa/app/appinfo/DefaultAppShortcutPreference.kt
View File

@@ -26,7 +26,6 @@ import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.liveData import androidx.lifecycle.liveData
import com.android.settings.R import com.android.settings.R
@@ -49,7 +48,6 @@ data class DefaultAppShortcut(
@StringRes val titleResId: Int, @StringRes val titleResId: Int,
) )
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable @Composable
fun DefaultAppShortcutPreference(shortcut: DefaultAppShortcut, app: ApplicationInfo) { fun DefaultAppShortcutPreference(shortcut: DefaultAppShortcut, app: ApplicationInfo) {
val context = LocalContext.current val context = LocalContext.current

2
src/com/android/settings/spa/app/appinfo/HibernationSwitchPreference.kt
View File

@@ -35,7 +35,6 @@ import com.android.settings.R
import com.android.settings.Utils.PROPERTY_APP_HIBERNATION_ENABLED import com.android.settings.Utils.PROPERTY_APP_HIBERNATION_ENABLED
import com.android.settings.Utils.PROPERTY_HIBERNATION_TARGETS_PRE_S_APPS import com.android.settings.Utils.PROPERTY_HIBERNATION_TARGETS_PRE_S_APPS
import com.android.settingslib.spa.framework.compose.OverridableFlow import com.android.settingslib.spa.framework.compose.OverridableFlow
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.settingslib.spa.framework.compose.stateOf import com.android.settingslib.spa.framework.compose.stateOf
import com.android.settingslib.spa.widget.preference.SwitchPreference import com.android.settingslib.spa.widget.preference.SwitchPreference
@@ -52,7 +51,6 @@ import kotlinx.coroutines.withContext
import kotlin.coroutines.resume import kotlin.coroutines.resume
import kotlin.coroutines.suspendCoroutine import kotlin.coroutines.suspendCoroutine
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable @Composable
fun HibernationSwitchPreference(app: ApplicationInfo) { fun HibernationSwitchPreference(app: ApplicationInfo) {
val context = LocalContext.current val context = LocalContext.current

2
src/com/android/settings/spa/app/appinfo/InstantAppDomainsPreference.kt
View File

@@ -34,7 +34,6 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import com.android.settings.R import com.android.settings.R
import com.android.settings.Utils import com.android.settings.Utils
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.settingslib.spa.framework.theme.SettingsDimension import com.android.settingslib.spa.framework.theme.SettingsDimension
import com.android.settingslib.spa.widget.preference.Preference import com.android.settingslib.spa.widget.preference.Preference
@@ -46,7 +45,6 @@ import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable @Composable
fun InstantAppDomainsPreference(app: ApplicationInfo) { fun InstantAppDomainsPreference(app: ApplicationInfo) {
val context = LocalContext.current val context = LocalContext.current

2
src/com/android/settings/spa/app/appinfo/InteractAcrossProfilesDetailsPreference.kt
View File

@@ -25,7 +25,6 @@ import androidx.compose.ui.res.stringResource
import com.android.settings.R import com.android.settings.R
import com.android.settings.applications.appinfo.AppInfoDashboardFragment import com.android.settings.applications.appinfo.AppInfoDashboardFragment
import com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesDetails import com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesDetails
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.settingslib.spa.widget.preference.Preference import com.android.settingslib.spa.widget.preference.Preference
import com.android.settingslib.spa.widget.preference.PreferenceModel import com.android.settingslib.spa.widget.preference.PreferenceModel
@@ -34,7 +33,6 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.flowOn
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable @Composable
fun InteractAcrossProfilesDetailsPreference(app: ApplicationInfo) { fun InteractAcrossProfilesDetailsPreference(app: ApplicationInfo) {
val context = LocalContext.current val context = LocalContext.current

2
src/com/android/settings/spa/system/AppLanguagesListModel.kt
View File

@@ -26,7 +26,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.State import androidx.compose.runtime.State
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.settings.R import com.android.settings.R
import com.android.settings.applications.AppLocaleUtil import com.android.settings.applications.AppLocaleUtil
@@ -79,7 +78,6 @@ class AppLanguagesListModel(private val context: Context) : AppListModel<AppLang
recordListFlow: Flow<List<AppLanguagesRecord>>, recordListFlow: Flow<List<AppLanguagesRecord>>,
) = recordListFlow.filterItem { it.isAppLocaleSupported } ) = recordListFlow.filterItem { it.isAppLocaleSupported }
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable @Composable
override fun getSummary(option: Int, record: AppLanguagesRecord): State<String> = override fun getSummary(option: Int, record: AppLanguagesRecord): State<String> =
remember(record.app) { remember(record.app) {