diff --git a/res/xml/apps.xml b/res/xml/apps.xml index db46a1a7265..90c40a691ba 100644 --- a/res/xml/apps.xml +++ b/res/xml/apps.xml @@ -116,7 +116,7 @@ + android:title="@string/aspect_ratio_experimental_title"> diff --git a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt index 520634395e7..61098e82628 100644 --- a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt +++ b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt @@ -41,7 +41,7 @@ fun UserAspectRatioAppPreference(app: ApplicationInfo) { if (!presenter.isAvailableFlow.collectAsStateWithLifecycle(initialValue = false).value) return Preference(object : PreferenceModel { - override val title = stringResource(R.string.aspect_ratio_title) + override val title = stringResource(R.string.aspect_ratio_experimental_title) override val summary = presenter.summaryFlow.collectAsStateWithLifecycle( initialValue = stringResource(R.string.summary_placeholder), ) diff --git a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt index a15401cf826..e74f1e333dc 100644 --- a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt +++ b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt @@ -82,7 +82,7 @@ object UserAspectRatioAppsPageProvider : SettingsPageProvider { @VisibleForTesting fun EntryItem() = Preference(object : PreferenceModel { - override val title = stringResource(R.string.aspect_ratio_title) + override val title = stringResource(R.string.aspect_ratio_experimental_title) override val summary = getSummary().toState() override val onClick = navigator(name) }) @@ -104,7 +104,7 @@ fun UserAspectRatioAppList( = { AppList() }, ) { AppListPage( - title = stringResource(R.string.aspect_ratio_title), + title = stringResource(R.string.aspect_ratio_experimental_title), listModel = rememberContext(::UserAspectRatioAppListModel), appList = appList, header = { diff --git a/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreferenceTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreferenceTest.kt index 265d92d32ca..46ee3f19b05 100644 --- a/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreferenceTest.kt +++ b/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreferenceTest.kt @@ -145,7 +145,7 @@ class UserAspectRatioAppPreferenceTest { composeTestRule.onNode( hasTextExactly( - context.getString(R.string.aspect_ratio_title), + context.getString(R.string.aspect_ratio_experimental_title), context.getString(R.string.user_aspect_ratio_app_default) ), ).assertIsDisplayed().assertIsEnabled() diff --git a/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt index b36a74c08a6..f550326981b 100644 --- a/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt +++ b/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt @@ -59,7 +59,7 @@ class UserAspectRatioAppsPageProviderTest { @Test fun injectEntry_title() { setInjectEntry() - composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_title)) + composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_experimental_title)) .assertIsDisplayed() } @@ -74,7 +74,7 @@ class UserAspectRatioAppsPageProviderTest { @Test fun injectEntry_onClick_navigate() { setInjectEntry() - composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_title)) + composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_experimental_title)) .performClick() assertThat(fakeNavControllerWrapper.navigateCalledWith).isEqualTo("UserAspectRatioAppsPage") } @@ -93,7 +93,7 @@ class UserAspectRatioAppsPageProviderTest { UserAspectRatioAppList {} } - composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_title)) + composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_experimental_title)) .assertIsDisplayed() }