diff options
4 files changed, 12 insertions, 25 deletions
diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/BasePreference.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/BasePreference.kt index c75f41b30d3e..081e6680c489 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/BasePreference.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/BasePreference.kt @@ -45,11 +45,10 @@ internal fun BasePreference( BaseLayout( title = title, subTitle = { - if (singleLineSummary) { - SettingsBody(body = summary, maxLines = 1) - } else { - SettingsBody(body = summary) - } + SettingsBody( + body = summary.value, + maxLines = if (singleLineSummary) 1 else Int.MAX_VALUE, + ) }, modifier = modifier, icon = icon, diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Text.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Text.kt index 01ba8f82850d..57319e760c69 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Text.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Text.kt @@ -24,7 +24,6 @@ import androidx.compose.foundation.layout.width import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.State import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextOverflow @@ -35,11 +34,6 @@ import com.android.settingslib.spa.framework.theme.SettingsTheme import com.android.settingslib.spa.framework.theme.toMediumWeight @Composable -fun SettingsTitle(title: State<String>, useMediumWeight: Boolean = false) { - SettingsTitle(title.value, useMediumWeight) -} - -@Composable fun SettingsTitle(title: String, useMediumWeight: Boolean = false) { Text( text = title, @@ -55,14 +49,6 @@ fun SettingsTitle(title: String, useMediumWeight: Boolean = false) { @Composable fun SettingsBody( - body: State<String>, - maxLines: Int = Int.MAX_VALUE, -) { - SettingsBody(body = body.value, maxLines = maxLines) -} - -@Composable -fun SettingsBody( body: String, maxLines: Int = Int.MAX_VALUE, ) { diff --git a/packages/SettingsLib/Spa/tests/src/com/android/settingslib/spa/widget/ui/TextTest.kt b/packages/SettingsLib/Spa/tests/src/com/android/settingslib/spa/widget/ui/TextTest.kt index 7e5b4f851250..f9c1f948200e 100644 --- a/packages/SettingsLib/Spa/tests/src/com/android/settingslib/spa/widget/ui/TextTest.kt +++ b/packages/SettingsLib/Spa/tests/src/com/android/settingslib/spa/widget/ui/TextTest.kt @@ -20,7 +20,6 @@ import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithText import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.android.settingslib.spa.framework.compose.toState import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -31,14 +30,17 @@ class TextTest { val composeTestRule = createComposeRule() @Test - fun testTitle() { + fun settingsTitle() { composeTestRule.setContent { SettingsTitle(title = "myTitleValue") - SettingsTitle(title = "myTitleState".toState()) - PlaceholderTitle(title = "myTitlePlaceholder") } - composeTestRule.onNodeWithText("myTitleState").assertIsDisplayed() composeTestRule.onNodeWithText("myTitleValue").assertIsDisplayed() + } + + fun placeholderTitle() { + composeTestRule.setContent { + PlaceholderTitle(title = "myTitlePlaceholder") + } composeTestRule.onNodeWithText("myTitlePlaceholder").assertIsDisplayed() } } diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfo.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfo.kt index ddb92b19b0cf..b43210f0c3e4 100644 --- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfo.kt +++ b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfo.kt @@ -122,5 +122,5 @@ internal fun AppIcon(app: ApplicationInfo, size: Dp) { @Composable internal fun AppLabel(app: ApplicationInfo, isClonedAppPage: Boolean = false) { val appRepository = rememberAppRepository() - SettingsTitle(title = appRepository.produceLabel(app, isClonedAppPage), useMediumWeight = true) + SettingsTitle(appRepository.produceLabel(app, isClonedAppPage).value, useMediumWeight = true) } |