Cleanup experimental annotations

lawnchair/src/app/lawnchair/HeadlessWidgetsManager.kt

@@ -44,7 +44,6 @@ class HeadlessWidgetsManager(private val context: Context) {
         return subscription.flow
     }
 
-    @OptIn(ExperimentalCoroutinesApi::class)
     private fun createSubscription(info: AppWidgetProviderInfo, prefKey: String): WidgetSubscription {
         val subscription = WidgetSubscription(info)
         subscription.flow = callbackFlow {

lawnchair/src/app/lawnchair/font/FontCache.kt

@@ -64,7 +64,7 @@ class FontCache private constructor(private val context: Context) {
         loadFontAsync(font)
     }
 
-    @ExperimentalCoroutinesApi
+    @OptIn(ExperimentalCoroutinesApi::class)
     fun getLoadedFont(font: Font): LoadedFont? {
         val deferredFont = deferredFonts[font] ?: return null
         if (!deferredFont.isCompleted) return null

lawnchair/src/app/lawnchair/gestures/handlers/SleepGestureHandler.kt

@@ -27,7 +27,6 @@ import android.os.Build
 import android.provider.Settings
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.requiredWidth
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material3.Button
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Text
@@ -51,7 +50,6 @@ class SleepGestureHandler(context: Context) : GestureHandler(context) {
         methods.first { it.isSupported() }.sleep(launcher)
     }
 
-    @OptIn(ExperimentalMaterialApi::class)
     private val methods = listOf(
         SleepMethodRoot(context),
         SleepMethodPieAccessibility(context),
@@ -74,7 +72,6 @@ class SleepMethodRoot(context: Context) : SleepGestureHandler.SleepMethod(contex
     }
 }
 
-@ExperimentalMaterialApi
 class SleepMethodPieAccessibility(context: Context) : SleepGestureHandler.SleepMethod(context) {
     override suspend fun isSupported() = Utilities.ATLEAST_P
 
@@ -98,7 +95,6 @@ class SleepMethodPieAccessibility(context: Context) : SleepGestureHandler.SleepM
     }
 }
 
-@ExperimentalMaterialApi
 class SleepMethodDeviceAdmin(context: Context) : SleepGestureHandler.SleepMethod(context) {
     override suspend fun isSupported() = true
 
@@ -132,7 +128,6 @@ class SleepMethodDeviceAdmin(context: Context) : SleepGestureHandler.SleepMethod
     }
 }
 
-@ExperimentalMaterialApi
 @Composable
 fun ServiceWarningDialog(
     title: Int,

lawnchair/src/app/lawnchair/override/CustomizeDialog.kt

@@ -4,14 +4,15 @@ import android.app.Activity
 import android.graphics.drawable.Drawable
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Text
+import androidx.compose.material.TextFieldDefaults
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
@@ -34,7 +35,6 @@ import com.android.launcher3.util.ComponentKey
 import com.google.accompanist.drawablepainter.rememberDrawablePainter
 import kotlinx.coroutines.launch
 
-@ExperimentalMaterialApi
 @Composable
 fun CustomizeDialog(
     icon: Drawable,
@@ -93,8 +93,6 @@ fun CustomizeDialog(
     }
 }
 
-@OptIn(ExperimentalComposeUiApi::class, ExperimentalAnimationApi::class)
-@ExperimentalMaterialApi
 @Composable
 fun CustomizeAppDialog(
     icon: Drawable,

lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt

@@ -3,7 +3,6 @@ package app.lawnchair.ui.popup
 import android.content.pm.LauncherActivityInfo
 import android.view.View
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.ui.unit.dp
 import app.lawnchair.LawnchairLauncher
 import app.lawnchair.override.CustomizeAppDialog
@@ -30,7 +29,6 @@ class LawnchairShortcut {
         itemInfo: ItemInfo
     ) : SystemShortcut<LawnchairLauncher>(R.drawable.ic_edit, R.string.customize_button_text, launcher, itemInfo) {
 
-        @OptIn(ExperimentalMaterialApi::class)
         override fun onClick(v: View) {
             val outObj = Array<Any?>(1) { null }
             val key = ComponentKey(mItemInfo.targetComponent, mItemInfo.user)

lawnchair/src/app/lawnchair/ui/preferences/AppDrawerPreferences.kt

@@ -33,14 +33,12 @@ object AppDrawerRoutes {
     const val HIDDEN_APPS = "hiddenApps"
 }
 
-@ExperimentalAnimationApi
 fun NavGraphBuilder.appDrawerGraph(route: String) {
     preferenceGraph(route, { AppDrawerPreferences() }) { subRoute ->
         hiddenAppsGraph(route = subRoute(AppDrawerRoutes.HIDDEN_APPS))
     }
 }
 
-@ExperimentalAnimationApi
 @Composable
 fun AppDrawerPreferences() {
     val prefs = preferenceManager()

lawnchair/src/app/lawnchair/ui/preferences/DebugMenuPreferences.kt

@@ -1,8 +1,6 @@
 package app.lawnchair.ui.preferences
 
 import android.content.Intent
-import androidx.compose.animation.ExperimentalAnimationApi
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
@@ -17,8 +15,6 @@ import com.android.launcher3.settings.DeveloperOptionsFragment
 import com.android.launcher3.settings.SettingsActivity
 import com.patrykmichalik.preferencemanager.Preference
 
-@ExperimentalMaterialApi
-@ExperimentalAnimationApi
 fun NavGraphBuilder.debugMenuGraph(route: String) {
     preferenceGraph(route, { DebugMenuPreferences() })
 }
@@ -26,8 +22,6 @@ fun NavGraphBuilder.debugMenuGraph(route: String) {
 /**
  * A screen to house unfinished preferences and debug flags
  */
-@ExperimentalMaterialApi
-@ExperimentalAnimationApi
 @Composable
 fun DebugMenuPreferences() {
     val prefs = preferenceManager()

lawnchair/src/app/lawnchair/ui/preferences/DockPreferences.kt

@@ -26,12 +26,10 @@ import app.lawnchair.preferences2.preferenceManager2
 import app.lawnchair.ui.preferences.components.*
 import com.android.launcher3.R
 
-@ExperimentalAnimationApi
 fun NavGraphBuilder.dockGraph(route: String) {
     preferenceGraph(route, { DockPreferences() })
 }
 
-@ExperimentalAnimationApi
 @Composable
 fun DockPreferences() {
     val prefs = preferenceManager()

lawnchair/src/app/lawnchair/ui/preferences/ExperimentalFeaturesPreferences.kt

@@ -1,6 +1,5 @@
 package app.lawnchair.ui.preferences
 
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.navigation.NavGraphBuilder
@@ -11,13 +10,11 @@ import app.lawnchair.ui.preferences.components.PreferenceLayout
 import app.lawnchair.ui.preferences.components.SwitchPreference
 import com.android.launcher3.R
 
-@ExperimentalAnimationApi
 fun NavGraphBuilder.experimentalFeaturesGraph(route: String) {
     preferenceGraph(route, { ExperimentalFeaturesPreferences() })
 }
 
 @Composable
-@OptIn(ExperimentalAnimationApi::class)
 fun ExperimentalFeaturesPreferences() {
     val prefs = preferenceManager2()
     PreferenceLayout(label = stringResource(id = R.string.experimental_features_label)) {

lawnchair/src/app/lawnchair/ui/preferences/FolderPreferences.kt

@@ -16,7 +16,6 @@
 
 package app.lawnchair.ui.preferences
 
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.navigation.NavGraphBuilder
@@ -28,12 +27,10 @@ import app.lawnchair.ui.preferences.components.PreferenceLayout
 import app.lawnchair.ui.preferences.components.SliderPreference
 import com.android.launcher3.R
 
-@ExperimentalAnimationApi
 fun NavGraphBuilder.folderGraph(route: String) {
     preferenceGraph(route, { FolderPreferences() })
 }
 
-@ExperimentalAnimationApi
 @Composable
 fun FolderPreferences() {
     PreferenceLayout(label = stringResource(id = R.string.folders_label)) {

lawnchair/src/app/lawnchair/ui/preferences/FontSelectionPreference.kt

@@ -32,7 +32,7 @@ import app.lawnchair.ui.preferences.components.*
 import com.android.launcher3.R
 import com.google.accompanist.navigation.animation.composable
 
-@ExperimentalAnimationApi
+@OptIn(ExperimentalAnimationApi::class)
 fun NavGraphBuilder.fontSelectionGraph(route: String) {
     preferenceGraph(route, {}) { subRoute ->
         composable(
@@ -50,7 +50,6 @@ fun NavGraphBuilder.fontSelectionGraph(route: String) {
     }
 }
 
-@ExperimentalAnimationApi
 @Composable
 fun FontSelection(fontPref: BasePreferenceManager.FontPref) {
     val context = LocalContext.current

lawnchair/src/app/lawnchair/ui/preferences/GeneralPreferences.kt

@@ -34,16 +34,12 @@ object GeneralRoutes {
     const val ICON_PACK = "iconPack"
 }
 
-@ExperimentalMaterialApi
-@ExperimentalAnimationApi
 fun NavGraphBuilder.generalGraph(route: String) {
     preferenceGraph(route, { GeneralPreferences() }) { subRoute ->
         iconPackGraph(route = subRoute(GeneralRoutes.ICON_PACK))
     }
 }
 
-@ExperimentalMaterialApi
-@ExperimentalAnimationApi
 @Composable
 fun GeneralPreferences() {
     val prefs = preferenceManager()

lawnchair/src/app/lawnchair/ui/preferences/HiddenAppsPreferences.kt

@@ -17,7 +17,6 @@
 package app.lawnchair.ui.preferences
 
 import androidx.compose.animation.Crossfade
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -38,12 +37,10 @@ import app.lawnchair.util.appsList
 import com.android.launcher3.R
 import java.util.Comparator.comparing
 
-@ExperimentalAnimationApi
 fun NavGraphBuilder.hiddenAppsGraph(route: String) {
     preferenceGraph(route, { HiddenAppsPreferences() })
 }
 
-@ExperimentalAnimationApi
 @Composable
 fun HiddenAppsPreferences() {
     val adapter = preferenceManager2().hiddenApps.getAdapter()

lawnchair/src/app/lawnchair/ui/preferences/HomeScreenGridPreferences.kt

@@ -1,7 +1,6 @@
 package app.lawnchair.ui.preferences
 
 import android.content.res.Configuration
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -31,12 +30,10 @@ import app.lawnchair.ui.preferences.components.SliderPreference
 import com.android.launcher3.LauncherAppState
 import com.android.launcher3.R
 
-@ExperimentalAnimationApi
 fun NavGraphBuilder.homeScreenGridGraph(route: String) {
     preferenceGraph(route, { HomeScreenGridPreferences() })
 }
 
-@ExperimentalAnimationApi
 @Composable
 fun HomeScreenGridPreferences() {
     val isPortrait = LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT

lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt

@@ -36,14 +36,12 @@ object HomeScreenRoutes {
     const val GRID = "grid"
 }
 
-@ExperimentalAnimationApi
 fun NavGraphBuilder.homeScreenGraph(route: String) {
     preferenceGraph(route, { HomeScreenPreferences() }) { subRoute ->
         homeScreenGridGraph(route = subRoute(HomeScreenRoutes.GRID))
     }
 }
 
-@ExperimentalAnimationApi
 @Composable
 fun HomeScreenPreferences() {
     val prefs = preferenceManager()

lawnchair/src/app/lawnchair/ui/preferences/IconPackPreferences.kt

@@ -18,7 +18,6 @@ package app.lawnchair.ui.preferences
 
 import android.content.res.Configuration
 import android.graphics.drawable.Drawable
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -54,16 +53,14 @@ data class IconPackInfo(
     val icon: Drawable
 )
 
-@ExperimentalAnimationApi
 fun NavGraphBuilder.iconPackGraph(route: String) {
     preferenceGraph(route, { IconPackPreferences() })
 }
 
-@ExperimentalAnimationApi
 @Composable
 fun IconPackPreferences() {
     val prefs = preferenceManager()
-    var iconPackAdapter = prefs.iconPackPackage.getAdapter()
+    val iconPackAdapter = prefs.iconPackPackage.getAdapter()
     val themedIconsAdapter = prefs.themedIcons.getAdapter()
 
     PreferenceLayout(

lawnchair/src/app/lawnchair/ui/preferences/IconPickerPreference.kt

@@ -20,7 +20,6 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalLayoutDirection
@@ -44,7 +43,7 @@ import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.launch
 import androidx.compose.material.MaterialTheme as Material2Theme
 
-@ExperimentalAnimationApi
+@OptIn(ExperimentalAnimationApi::class)
 fun NavGraphBuilder.iconPickerGraph(route: String) {
     preferenceGraph(route, {
         IconPickerPreference(packageName = "")
@@ -62,7 +61,6 @@ fun NavGraphBuilder.iconPickerGraph(route: String) {
     }
 }
 
-@ExperimentalAnimationApi
 @Composable
 fun IconPickerPreference(packageName: String) {
     val context = LocalContext.current

lawnchair/src/app/lawnchair/ui/preferences/PreferenceActivity.kt

@@ -21,15 +21,11 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.animation.ExperimentalAnimationApi
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.core.net.toUri
 import androidx.core.view.WindowCompat
 import app.lawnchair.ui.theme.LawnchairTheme
 import com.google.accompanist.insets.ProvideWindowInsets
 
-@ExperimentalMaterialApi
-@ExperimentalAnimationApi
 class PreferenceActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt

@@ -17,7 +17,6 @@
 package app.lawnchair.ui.preferences
 
 import androidx.compose.animation.ExperimentalAnimationApi
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -59,8 +58,7 @@ val LocalPreferenceInteractor = staticCompositionLocalOf<PreferenceInteractor> {
     error("CompositionLocal LocalPreferenceInteractor not present")
 }
 
-@ExperimentalMaterialApi
-@ExperimentalAnimationApi
+@OptIn(ExperimentalAnimationApi::class)
 @Composable
 fun Preferences(interactor: PreferenceInteractor = viewModel<PreferenceViewModel>()) {
     val navController = rememberAnimatedNavController()
@@ -103,7 +101,6 @@ fun Preferences(interactor: PreferenceInteractor = viewModel<PreferenceViewModel
     }
 }
 
-@ExperimentalMaterialApi
 @Composable
 private fun Providers(
     content: @Composable () -> Unit

lawnchair/src/app/lawnchair/ui/preferences/PreferencesDashboard.kt

@@ -4,7 +4,6 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.pm.LauncherApps
 import android.os.Process
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.material.DropdownMenuItem
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Build
@@ -27,7 +26,6 @@ import app.lawnchair.util.restartLauncher
 import com.android.launcher3.BuildConfig
 import com.android.launcher3.R
 
-@ExperimentalAnimationApi
 @Composable
 fun PreferencesDashboard() {
     PreferenceLayout(

lawnchair/src/app/lawnchair/ui/preferences/QuickstepPreferences.kt

@@ -21,12 +21,10 @@ import com.android.launcher3.LauncherAppState
 import com.android.launcher3.R
 import com.android.launcher3.Utilities
 
-@ExperimentalAnimationApi
 fun NavGraphBuilder.quickstepGraph(route: String) {
     preferenceGraph(route, { QuickstepPreferences() })
 }
 
-@ExperimentalAnimationApi
 @Composable
 fun QuickstepPreferences() {
     val prefs = preferenceManager()

lawnchair/src/app/lawnchair/ui/preferences/SelectIconPreference.kt

@@ -24,7 +24,7 @@ import com.android.launcher3.util.ComponentKey
 import com.google.accompanist.navigation.animation.composable
 import kotlinx.coroutines.launch
 
-@ExperimentalAnimationApi
+@OptIn(ExperimentalAnimationApi::class)
 fun NavGraphBuilder.selectIconGraph(route: String) {
     preferenceGraph(route, { }) { subRoute ->
         composable(
@@ -43,7 +43,6 @@ fun NavGraphBuilder.selectIconGraph(route: String) {
     }
 }
 
-@ExperimentalAnimationApi
 @Composable
 fun SelectIconPreference(componentKey: ComponentKey) {
     val context = LocalContext.current

lawnchair/src/app/lawnchair/ui/preferences/about/About.kt

@@ -20,7 +20,6 @@ import android.content.Intent
 import android.net.Uri
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
@@ -177,14 +176,12 @@ object AboutRoutes {
     const val LICENSES = "licenses"
 }
 
-@ExperimentalAnimationApi
 fun NavGraphBuilder.aboutGraph(route: String) {
     preferenceGraph(route, { About() }) { subRoute ->
         licensesGraph(route = subRoute(AboutRoutes.LICENSES))
     }
 }
 
-@ExperimentalAnimationApi
 @Composable
 fun About() {
     val context = LocalContext.current

lawnchair/src/app/lawnchair/ui/preferences/about/ContributorRow.kt

@@ -32,10 +32,8 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import app.lawnchair.theme.surfaceColorAtElevation
 import app.lawnchair.ui.preferences.components.PreferenceTemplate
-import coil.annotation.ExperimentalCoilApi
 import coil.compose.rememberImagePainter
 
-@OptIn(ExperimentalCoilApi::class)
 @Composable
 fun ContributorRow(name: String, description: String, photoUrl: String, url: String, showDivider: Boolean = false) {
     val context = LocalContext.current

lawnchair/src/app/lawnchair/ui/preferences/about/acknowledgements/Acknowledgements.kt

@@ -48,7 +48,7 @@ import com.google.accompanist.placeholder.PlaceholderHighlight
 import com.google.accompanist.placeholder.material.fade
 import com.google.accompanist.placeholder.material.placeholder
 
-@ExperimentalAnimationApi
+@OptIn(ExperimentalAnimationApi::class)
 fun NavGraphBuilder.licensesGraph(route: String) {
     preferenceGraph(route, { Acknowledgements() }) { subRoute ->
         composable(
@@ -60,7 +60,6 @@ fun NavGraphBuilder.licensesGraph(route: String) {
     }
 }
 
-@ExperimentalAnimationApi
 @Composable
 fun Acknowledgements() {
     val ossLibraries by LocalPreferenceInteractor.current.ossLibraries.collectAsState()
@@ -94,7 +93,6 @@ fun OssLibraryItem(ossLibrary: OssLibrary, index: Int) {
     )
 }
 
-@ExperimentalAnimationApi
 @Composable
 fun NoticePage(index: Int) {
     val ossLibraries by LocalPreferenceInteractor.current.ossLibraries.collectAsState()

lawnchair/src/app/lawnchair/ui/preferences/components/IconShapePreference.kt

@@ -16,7 +16,6 @@
 
 package app.lawnchair.ui.preferences.components
 
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
@@ -27,7 +26,6 @@ import app.lawnchair.preferences.getAdapter
 import app.lawnchair.preferences2.preferenceManager2
 import com.android.launcher3.R
 
-@ExperimentalMaterialApi
 @Composable
 fun IconShapePreference(
 ) {

lawnchair/src/app/lawnchair/ui/preferences/components/ListPreference.kt

@@ -19,7 +19,6 @@ package app.lawnchair.ui.preferences.components
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.RadioButton
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Text
@@ -31,7 +30,6 @@ import app.lawnchair.preferences.PreferenceAdapter
 import app.lawnchair.ui.AlertBottomSheetContent
 import app.lawnchair.ui.util.bottomSheetHandler
 
-@ExperimentalMaterialApi
 @Composable
 fun <T> ListPreference(
     adapter: PreferenceAdapter<T>,

lawnchair/src/app/lawnchair/ui/preferences/components/NotificationDotsPreference.kt

@@ -26,7 +26,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.requiredWidth
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.ContentAlpha
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
@@ -49,7 +48,6 @@ import com.android.launcher3.util.SettingsCache
 import com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI
 
 @Composable
-@ExperimentalMaterialApi
 fun NotificationDotsPreference() {
     val bottomSheetHandler = bottomSheetHandler
     val context = LocalContext.current
@@ -96,7 +94,6 @@ fun NotificationDotsPreference() {
 }
 
 @Composable
-@ExperimentalMaterialApi
 fun NotificationAccessConfirmation(onDismissRequest: () -> Unit) {
     val context = LocalContext.current
 

lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceGroup.kt

@@ -30,7 +30,6 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.material3.MaterialTheme as Material3Theme
 
 @Composable
-@ExperimentalAnimationApi
 fun PreferenceGroup(
     heading: String? = null,
     isFirstChild: Boolean = false,

lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceLayout.kt

@@ -16,7 +16,6 @@
 
 package app.lawnchair.ui.preferences.components
 
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.ColumnScope
@@ -33,7 +32,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 
 @Composable
-@ExperimentalAnimationApi
 fun PreferenceLayout(
     verticalArrangement: Arrangement.Vertical = Arrangement.Top,
     horizontalAlignment: Alignment.Horizontal = Alignment.Start,
@@ -59,7 +57,6 @@ fun PreferenceLayout(
 }
 
 @Composable
-@ExperimentalAnimationApi
 fun PreferenceLayoutLazyColumn(
     modifier: Modifier = Modifier,
     enabled: Boolean = true,

lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceScaffold.kt

@@ -1,6 +1,5 @@
 package app.lawnchair.ui.preferences.components
 
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.runtime.Composable
@@ -13,7 +12,6 @@ import com.google.accompanist.insets.LocalWindowInsets
 import com.google.accompanist.insets.rememberInsetsPaddingValues
 import com.google.accompanist.insets.ui.Scaffold
 
-@ExperimentalAnimationApi
 @Composable
 fun PreferenceScaffold(
     backArrowVisible: Boolean = true,

lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceSearchScaffold.kt

@@ -1,7 +1,6 @@
 package app.lawnchair.ui.preferences.components
 
 import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.ContentAlpha
 import androidx.compose.material.LocalContentAlpha
@@ -22,7 +21,6 @@ import com.google.accompanist.insets.statusBarsPadding
 import com.google.accompanist.insets.ui.LocalScaffoldPadding
 import com.google.accompanist.insets.ui.Scaffold
 
-@ExperimentalAnimationApi
 @Composable
 fun PreferenceSearchScaffold(
     searchInput: @Composable () -> Unit,

lawnchair/src/app/lawnchair/ui/preferences/components/QsbProviderPreference.kt

@@ -1,20 +1,16 @@
 package app.lawnchair.ui.preferences.components
 
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import app.lawnchair.preferences.getAdapter
-import app.lawnchair.preferences2.PreferenceCollectorScope
-import app.lawnchair.preferences2.PreferenceManager2
 import app.lawnchair.preferences2.preferenceManager2
 import app.lawnchair.qsb.QsbLayout
 import app.lawnchair.qsb.providers.GoogleGo
 import app.lawnchair.qsb.providers.QsbSearchProvider
 import com.android.launcher3.R
 
-@OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun QsbProviderPreference() {
     val adapter = preferenceManager2().hotseatQsbProvider.getAdapter()

lawnchair/src/app/lawnchair/ui/preferences/components/ThemePreference.kt

@@ -1,6 +1,5 @@
 package app.lawnchair.ui.preferences.components
 
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import app.lawnchair.preferences.getAdapter
@@ -28,7 +27,6 @@ val themeEntries = listOf(
         }
     }
 
-@ExperimentalMaterialApi
 @Composable
 fun ThemePreference(showDivider: Boolean = false) {
     ListPreference(

lawnchair/src/app/lawnchair/ui/preferences/components/TopBar.kt

@@ -17,7 +17,6 @@
 package app.lawnchair.ui.preferences.components
 
 import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.ArrowBack
@@ -35,7 +34,6 @@ import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.insets.statusBarsPadding
 
-@ExperimentalAnimationApi
 @Composable
 fun TopBar(
     backArrowVisible: Boolean,

lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/ColorPreference.kt

@@ -16,10 +16,8 @@
 
 package app.lawnchair.ui.preferences.components.colorpreference
 
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.RadioButton
 import androidx.compose.material3.Button
 import androidx.compose.material3.MaterialTheme
@@ -42,8 +40,8 @@ import com.google.accompanist.pager.HorizontalPager
 import com.google.accompanist.pager.rememberPagerState
 import kotlinx.coroutines.launch
 
+@OptIn(ExperimentalPagerApi::class)
 @Composable
-@OptIn(ExperimentalAnimationApi::class, ExperimentalMaterialApi::class, ExperimentalPagerApi::class)
 fun ColorPreference(
     adapter: PreferenceAdapter<ColorOption>,
     label: String,

lawnchair/src/app/lawnchair/ui/preferences/preferenceGraph.kt

@@ -7,7 +7,7 @@ import androidx.compose.runtime.compositionLocalOf
 import androidx.navigation.NavGraphBuilder
 import com.google.accompanist.navigation.animation.composable
 
-@ExperimentalAnimationApi
+@OptIn(ExperimentalAnimationApi::class)
 inline fun NavGraphBuilder.preferenceGraph(
     route: String,
     crossinline root: @Composable () -> Unit,

lawnchair/src/app/lawnchair/ui/util/ProvideBottomSheetHandler.kt

@@ -43,7 +43,7 @@ val bottomSheetHandler: BottomSheetHandler
     @ReadOnlyComposable
     get() = LocalBottomSheetHandler.current
 
-@ExperimentalMaterialApi
+@OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun ProvideBottomSheetHandler(
     content: @Composable () -> Unit