diff options
4 files changed, 19 insertions, 11 deletions
diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/button/ActionButtons.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/button/ActionButtons.kt index 0552c408a8eb..1ad075c11985 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/button/ActionButtons.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/button/ActionButtons.kt @@ -31,7 +31,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Delete -import androidx.compose.material.icons.outlined.Launch import androidx.compose.material.icons.outlined.WarningAmber import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.FilledTonalButton @@ -52,6 +51,7 @@ import com.android.settingslib.spa.framework.theme.SettingsDimension import com.android.settingslib.spa.framework.theme.SettingsShape import com.android.settingslib.spa.framework.theme.SettingsTheme import com.android.settingslib.spa.framework.theme.divider +import androidx.compose.material.icons.automirrored.outlined.Launch data class ActionButton( val text: String, @@ -101,7 +101,9 @@ private fun RowScope.ActionButton(actionButton: ActionButton) { modifier = Modifier.size(SettingsDimension.itemIconSize), ) Box( - modifier = Modifier.padding(top = 4.dp).fillMaxHeight(), + modifier = Modifier + .padding(top = 4.dp) + .fillMaxHeight(), contentAlignment = Alignment.Center, ) { Text( @@ -129,7 +131,7 @@ private fun ActionButtonsPreview() { SettingsTheme { ActionButtons( listOf( - ActionButton(text = "Open", imageVector = Icons.Outlined.Launch) {}, + ActionButton(text = "Open", imageVector = Icons.AutoMirrored.Outlined.Launch) {}, ActionButton(text = "Uninstall", imageVector = Icons.Outlined.Delete) {}, ActionButton(text = "Force stop", imageVector = Icons.Outlined.WarningAmber) {}, ) diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/Actions.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/Actions.kt index 62189dccc9bf..6ef45900a103 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/Actions.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/Actions.kt @@ -18,7 +18,6 @@ package com.android.settingslib.spa.widget.scaffold import androidx.appcompat.R import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.ArrowBack import androidx.compose.material.icons.outlined.Clear import androidx.compose.material.icons.outlined.FindInPage import androidx.compose.material3.Icon @@ -31,6 +30,7 @@ import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.LayoutDirection import com.android.settingslib.spa.framework.compose.LocalNavController +import androidx.compose.material.icons.automirrored.outlined.ArrowBack /** Action that navigates back to last page. */ @Composable @@ -53,7 +53,7 @@ internal fun CollapseAction(onClick: () -> Unit) { private fun BackAction(contentDescription: String, onClick: () -> Unit) { IconButton(onClick) { Icon( - imageVector = Icons.Outlined.ArrowBack, + imageVector = Icons.AutoMirrored.Outlined.ArrowBack, contentDescription = contentDescription, modifier = Modifier.autoMirrored(), ) diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SettingsPager.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SettingsPager.kt index aa148b022b92..9f7f040be7ce 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SettingsPager.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SettingsPager.kt @@ -21,7 +21,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.rememberPagerState -import androidx.compose.material3.TabRow +import androidx.compose.material3.PrimaryTabRow import androidx.compose.runtime.Composable import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Modifier @@ -43,7 +43,7 @@ fun SettingsPager(titles: List<String>, content: @Composable (page: Int) -> Unit val coroutineScope = rememberCoroutineScope() val pagerState = rememberPagerState { titles.size } - TabRow( + PrimaryTabRow( selectedTabIndex = pagerState.currentPage, modifier = Modifier.padding(horizontal = SettingsDimension.itemPaddingEnd), containerColor = Color.Transparent, diff --git a/packages/SettingsLib/Spa/tests/src/com/android/settingslib/spa/widget/button/ActionButtonsTest.kt b/packages/SettingsLib/Spa/tests/src/com/android/settingslib/spa/widget/button/ActionButtonsTest.kt index f59b0decf1e5..8d9bac64b078 100644 --- a/packages/SettingsLib/Spa/tests/src/com/android/settingslib/spa/widget/button/ActionButtonsTest.kt +++ b/packages/SettingsLib/Spa/tests/src/com/android/settingslib/spa/widget/button/ActionButtonsTest.kt @@ -17,8 +17,8 @@ package com.android.settingslib.spa.widget.button import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.outlined.Launch import androidx.compose.material.icons.outlined.Close -import androidx.compose.material.icons.outlined.Launch import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue @@ -43,7 +43,10 @@ class ActionButtonsTest { composeTestRule.setContent { ActionButtons( listOf( - ActionButton(text = "Open", imageVector = Icons.Outlined.Launch) {}, + ActionButton( + text = "Open", + imageVector = Icons.AutoMirrored.Outlined.Launch + ) {}, ) ) } @@ -57,7 +60,7 @@ class ActionButtonsTest { composeTestRule.setContent { ActionButtons( listOf( - ActionButton(text = "Open", imageVector = Icons.Outlined.Launch) { + ActionButton(text = "Open", imageVector = Icons.AutoMirrored.Outlined.Launch) { clicked = true }, ) @@ -74,7 +77,10 @@ class ActionButtonsTest { composeTestRule.setContent { ActionButtons( listOf( - ActionButton(text = "Open", imageVector = Icons.Outlined.Launch) {}, + ActionButton( + text = "Open", + imageVector = Icons.AutoMirrored.Outlined.Launch + ) {}, ActionButton(text = "Close", imageVector = Icons.Outlined.Close) {}, ) ) |