diff --git a/res/values/strings.xml b/res/values/strings.xml index 48caa5e1348..81c67924ef4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12144,7 +12144,9 @@ Aspect ratio - Choose an aspect ratio to view this app if it hasn\'t been designed to fit your %1$s + Try a new aspect ratio to view this app if it hasn\'t been designed to fit your %1$s + + Try a new aspect ratio to view this app if it hasn\'t been designed to fit your %1$s. Some apps may not be optimized for certain aspect ratios. Suggested apps @@ -12164,7 +12166,7 @@ 4:3 - The app will restart when you change aspect ratio. You may lose unsaved changes. + The app will restart when you change aspect ratio. You may lose unsaved changes. Some apps may not be optimized for certain aspect ratios. diff --git a/res/xml/apps.xml b/res/xml/apps.xml index 651ed9bc98d..db46a1a7265 100644 --- a/res/xml/apps.xml +++ b/res/xml/apps.xml @@ -79,18 +79,6 @@ android:key="dashboard_tile_placeholder" android:order="10"/> - - - - - + + + + + + + diff --git a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt index e0907295ea7..f403743969b 100644 --- a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt +++ b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt @@ -109,7 +109,7 @@ fun UserAspectRatioAppList( appList = appList, header = { Box(Modifier.padding(SettingsDimension.itemPadding)) { - SettingsBody(UserAspectRatioAppsPageProvider.getSummary()) + SettingsBody(stringResource(R.string.aspect_ratio_main_summary, 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 c314655e0d2..044968d75e3 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 @@ -67,7 +67,8 @@ class UserAspectRatioAppsPageProviderTest { @Test fun injectEntry_summary() { setInjectEntry() - composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_summary, Build.MODEL)) + composeTestRule + .onNodeWithText(context.getString(R.string.aspect_ratio_summary, Build.MODEL)) .assertIsDisplayed() }