Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fafb4bf5 authored by Graciela Putri's avatar Graciela Putri Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I4e6ef486029a3f70cf7c267320c200c19384787a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 112b5765 242bde10

src/com/android/settings/applications/appcompat/UserAspectRatioAppsPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }

}

src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,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
@@ -109,7 +109,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

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

+1 −1
Original line number Diff line number Diff line
@@ -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()

    }