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

Commit d811e2b5 authored by Anvesh Renikindi's avatar Anvesh Renikindi Committed by Android (Google) Code Review
Browse files

Merge "Remove ExperimentalLifecycleComposeApi" into main

parents 524643a6 8d220f06

src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,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.applications.appcompat.UserAspectRatioDetails
@@ -35,7 +34,6 @@ import kotlinx.coroutines.Dispatchers 
import kotlinx.coroutines.flow.flow

import kotlinx.coroutines.flow.flowOn



@OptIn(ExperimentalLifecycleComposeApi::class)

@Composable

fun UserAspectRatioAppPreference(app: ApplicationInfo) {

    val context = LocalContext.current

src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt

+0 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import androidx.compose.runtime.State 
import androidx.compose.runtime.remember

import androidx.compose.ui.Modifier

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.applications.appcompat.UserAspectRatioManager
@@ -177,7 +176,6 @@ class UserAspectRatioAppListModel(private val context: Context) 
        }

    )



    @OptIn(ExperimentalLifecycleComposeApi::class)

    @Composable

    override fun getSummary(option: Int, record: UserAspectRatioAppListItemModel) : State<String> =

        remember(record.override) {

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