From bbb58cac694324d72ad9d3a3a3cb19fc48c10bb0 Mon Sep 17 00:00:00 2001 From: Graciela Wissen Putri Date: Wed, 20 Sep 2023 16:57:43 +0000 Subject: [PATCH] Change title to aspect ratio (experimental) Settings > Apps > Aspect ratio (experimental) Settings > Apps > App info > Aspect ratio (experimental) Fix: 300219974 Test: Manual && atest SettingsSpaUnitTests Merged-In: I359c744025232c6a6ebd9628dbf91acac85b53e9 Change-Id: I359c744025232c6a6ebd9628dbf91acac85b53e9 --- res/xml/apps.xml | 2 +- res/xml/user_aspect_ratio_details.xml | 2 +- .../spa/app/appcompat/UserAspectRatioAppPreference.kt | 2 +- .../spa/app/appcompat/UserAspectRatioAppsPageProvider.kt | 4 ++-- .../spa/app/appcompat/UserAspectRatioAppPreferenceTest.kt | 2 +- .../app/appcompat/UserAspectRatioAppsPageProviderTest.kt | 7 ++++--- 6 files changed, 10 insertions(+), 9 deletions(-) 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 3680715705e..05da903120b 100644 --- a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt +++ b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt @@ -43,7 +43,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 069be0110ec..012182601de 100644 --- a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt +++ b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt @@ -83,7 +83,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) }) @@ -105,7 +105,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 044968d75e3..98b393eb614 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 @@ -60,7 +60,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() } @@ -75,7 +75,8 @@ class UserAspectRatioAppsPageProviderTest { @Test fun injectEntry_onClick_navigate() { setInjectEntry() - composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_title)).performClick() + composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_experimental_title)) + .performClick() assertThat(fakeNavControllerWrapper.navigateCalledWith).isEqualTo("UserAspectRatioAppsPage") } @@ -93,7 +94,7 @@ class UserAspectRatioAppsPageProviderTest { UserAspectRatioAppList {} } - composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_title)) + composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_experimental_title)) .assertIsDisplayed() }