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

Commit 2268999f authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "[Spa] Fix build warnings" into main

parents 05fe6241 5278317c

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/compose/LifecycleEffect.kt

+1 −1
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ package com.android.settingslib.spa.framework.compose 


import androidx.compose.runtime.Composable

import androidx.compose.runtime.DisposableEffect

import androidx.compose.ui.platform.LocalLifecycleOwner

import androidx.lifecycle.Lifecycle

import androidx.lifecycle.LifecycleEventObserver

import androidx.lifecycle.compose.LocalLifecycleOwner



@Composable

fun LifecycleEffect(

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/compose/OnBackEffect.kt

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import androidx.compose.runtime.DisposableEffect 
import androidx.compose.runtime.getValue

import androidx.compose.runtime.remember

import androidx.compose.runtime.rememberUpdatedState

import androidx.compose.ui.platform.LocalLifecycleOwner

import androidx.lifecycle.compose.LocalLifecycleOwner



/**

 * An effect for detecting presses of the system back button, and the back event will not be

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/slice/presenter/Demo.kt

+1 −1
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ import androidx.compose.material3.HorizontalDivider 
import androidx.compose.runtime.Composable

import androidx.compose.runtime.remember

import androidx.compose.ui.platform.LocalContext

import androidx.compose.ui.platform.LocalLifecycleOwner

import androidx.compose.ui.viewinterop.AndroidView

import androidx.lifecycle.compose.LocalLifecycleOwner

import androidx.slice.widget.SliceLiveData

import androidx.slice.widget.SliceView

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/editor/DropdownTextBox.kt

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.width 
import androidx.compose.material3.ExperimentalMaterial3Api

import androidx.compose.material3.ExposedDropdownMenuBox

import androidx.compose.material3.ExposedDropdownMenuDefaults

import androidx.compose.material3.MenuAnchorType

import androidx.compose.material3.OutlinedTextField

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable
@@ -65,7 +66,7 @@ internal fun DropdownTextBox( 
        OutlinedTextField(

            // The `menuAnchor` modifier must be passed to the text field for correctness.

            modifier = Modifier

                .menuAnchor()

                .menuAnchor(MenuAnchorType.PrimaryNotEditable)

                .fillMaxWidth(),

            value = text,

            onValueChange = { },

packages/SettingsLib/Spa/tests/src/com/android/settingslib/spa/framework/compose/LifecycleEffectTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ package com.android.settingslib.spa.framework.compose 


import androidx.compose.runtime.CompositionLocalProvider

import androidx.compose.runtime.LaunchedEffect

import androidx.compose.ui.platform.LocalLifecycleOwner

import androidx.compose.ui.test.junit4.createComposeRule

import androidx.lifecycle.Lifecycle

import androidx.lifecycle.compose.LocalLifecycleOwner

import androidx.lifecycle.testing.TestLifecycleOwner

import androidx.test.ext.junit.runners.AndroidJUnit4

import com.google.common.truth.Truth.assertThat