PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update aspect ratio summary strings" into udc-qpr-dev am: 242bde10c8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24867213

Change-Id: I4e6ef486029a3f70cf7c267320c200c19384787a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Graciela Putri
2023-10-04 13:32:50 +00:00
committed by Automerger Merge Worker
parent 112b5765e0 242bde10c8
commit fafb4bf5ba
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/applications/appcompat/UserAspectRatioAppsPreferenceController.java
View File

@@ -43,6 +43,6 @@ public class UserAspectRatioAppsPreferenceController extends BasePreferenceContr
@Override @Override
public CharSequence getSummary() { 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);
} }
} }

4
src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
View File

@@ -95,7 +95,7 @@ object UserAspectRatioAppsPageProvider : SettingsPageProvider {
@Composable @Composable
@VisibleForTesting @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 @Composable
@@ -109,7 +109,7 @@ fun UserAspectRatioAppList(
appList = appList, appList = appList,
header = { header = {
Box(Modifier.padding(SettingsDimension.itemPadding)) { 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 { Illustration(object : IllustrationModel {
override val resId = R.raw.user_aspect_ratio_education override val resId = R.raw.user_aspect_ratio_education

2
tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt
View File

@@ -68,7 +68,7 @@ class UserAspectRatioAppsPageProviderTest {
fun injectEntry_summary() { fun injectEntry_summary() {
setInjectEntry() setInjectEntry()
composeTestRule composeTestRule
.onNodeWithText(context.getString(R.string.aspect_ratio_summary, Build.MODEL)) .onNodeWithText(context.getString(R.string.aspect_ratio_summary_text, Build.MODEL))
.assertIsDisplayed() .assertIsDisplayed()
} }