From 159b8aed3d85a805fc66ece22861a1a9c5d15231 Mon Sep 17 00:00:00 2001 From: Eghosa Ewansiha-Vlachavas Date: Tue, 26 Sep 2023 17:04:59 +0000 Subject: [PATCH] Update aspect ratio summary strings Replace usage of `aspect_ratio_summary` and `aspect_ratio_main_summary` with `aspect_ratio_summary_text` and `aspect_ratio_main_summary_text` Fixes: 302142203 Test: Manual Change-Id: Id7570269806e2dd15f45bdc0aad1ed0534e259b6 --- .../appcompat/UserAspectRatioAppsPreferenceController.java | 2 +- .../spa/app/appcompat/UserAspectRatioAppsPageProvider.kt | 4 ++-- .../spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/applications/appcompat/UserAspectRatioAppsPreferenceController.java b/src/com/android/settings/applications/appcompat/UserAspectRatioAppsPreferenceController.java index ff68fb015f2..4211424351b 100644 --- a/src/com/android/settings/applications/appcompat/UserAspectRatioAppsPreferenceController.java +++ b/src/com/android/settings/applications/appcompat/UserAspectRatioAppsPreferenceController.java @@ -43,6 +43,6 @@ public class UserAspectRatioAppsPreferenceController extends BasePreferenceContr @Override public CharSequence getSummary() { - return mContext.getResources().getString(R.string.aspect_ratio_summary, Build.MODEL); + return mContext.getResources().getString(R.string.aspect_ratio_summary_text, Build.MODEL); } } diff --git a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt index 012182601de..533d9205fb4 100644 --- a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt +++ b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt @@ -96,7 +96,7 @@ object UserAspectRatioAppsPageProvider : SettingsPageProvider { @Composable @VisibleForTesting - fun getSummary(): String = stringResource(R.string.aspect_ratio_summary, Build.MODEL) + fun getSummary(): String = stringResource(R.string.aspect_ratio_summary_text, Build.MODEL) } @Composable @@ -110,7 +110,7 @@ fun UserAspectRatioAppList( appList = appList, header = { Box(Modifier.padding(SettingsDimension.itemPadding)) { - SettingsBody(stringResource(R.string.aspect_ratio_main_summary, Build.MODEL)) + SettingsBody(stringResource(R.string.aspect_ratio_main_summary_text, Build.MODEL)) } Illustration(object : IllustrationModel { override val resId = R.raw.user_aspect_ratio_education 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 98b393eb614..1126cc53f83 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 @@ -68,7 +68,7 @@ class UserAspectRatioAppsPageProviderTest { fun injectEntry_summary() { setInjectEntry() composeTestRule - .onNodeWithText(context.getString(R.string.aspect_ratio_summary, Build.MODEL)) + .onNodeWithText(context.getString(R.string.aspect_ratio_summary_text, Build.MODEL)) .assertIsDisplayed() }