Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1febf9e authored by Chaohui Wang's avatar Chaohui Wang Committed by Anvesh Renikindi
Browse files

Remove ExperimentalLifecycleComposeApi 

Fix: 276310170
Bug: 271609607
Test: m Settings
Change-Id: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
Merged-In: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
(cherry picked from commit 8d220f06)
(cherry picked from commit 2910d683)
parent f72a53a5

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

+0 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 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.widget.preference.Preference
@@ -46,7 +45,6 @@ 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

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

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.settings.spa.app.appinfo 
import android.content.pm.ApplicationInfo

import androidx.compose.runtime.Composable

import androidx.compose.runtime.remember

import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi

import androidx.lifecycle.compose.collectAsStateWithLifecycle

import com.android.settingslib.applications.AppUtils

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 appForceStopButton = AppForceStopButton(packageInfoPresenter)



    @OptIn(ExperimentalLifecycleComposeApi::class)

    @Composable

    fun getActionButtons() =

        packageInfoPresenter.flow.collectAsStateWithLifecycle(initialValue = null).value?.let {

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

+0 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 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
@@ -44,7 +43,6 @@ 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

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

+0 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import androidx.compose.runtime.rememberCoroutineScope 
import androidx.compose.ui.platform.LocalContext

import androidx.compose.ui.res.stringResource

import androidx.fragment.app.Fragment

import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi

import androidx.lifecycle.compose.collectAsStateWithLifecycle

import androidx.navigation.NavType

import androidx.navigation.navArgument
@@ -114,7 +113,6 @@ object AppInfoSettingsProvider : SettingsPageProvider { 
    }

}



@OptIn(ExperimentalLifecycleComposeApi::class)

@Composable

private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {

    LifecycleEffect(onStart = { packageInfoPresenter.reloadPackageInfo() })

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

+0 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import com.android.settings.R 
import com.android.settings.Utils

import com.android.settings.applications.AppStoreUtil

import com.android.settingslib.applications.AppUtils

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
@@ -45,7 +44,6 @@ 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