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

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

Merge "Change title to aspect ratio (experimental)" into udc-qpr-dev am: f1c7bf34 

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



Change-Id: Ic630fd0179a9fd06a03df3a9b85ec38b021ac665
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed59726c f1c7bf34

res/xml/apps.xml

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ 


    <Preference

        android:key="aspect_ratio_apps"

        android:title="@string/aspect_ratio_title"

        android:title="@string/aspect_ratio_experimental_title"

        android:summary="@string/summary_placeholder"

        android:order="22"

        settings:controller="com.android.settings.applications.appcompat.UserAspectRatioAppsPreferenceController"

res/xml/user_aspect_ratio_details.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:title="@string/aspect_ratio_title">

    android:title="@string/aspect_ratio_experimental_title">



    <com.android.settingslib.widget.ActionButtonsPreference

        android:key="header_view" />

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

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

        )

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

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

        })
@@ -104,7 +104,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 = {

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

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