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

Commit bbb58cac authored by Graciela Wissen Putri's avatar Graciela Wissen Putri Committed by Graciela Putri
Browse files

Change title to aspect ratio (experimental) 

Settings > Apps > Aspect ratio (experimental)
Settings > Apps > App info > Aspect ratio (experimental)

Fix: 300219974
Test: Manual && atest SettingsSpaUnitTests
Merged-In: I359c744025232c6a6ebd9628dbf91acac85b53e9
Change-Id: I359c744025232c6a6ebd9628dbf91acac85b53e9
parent a72b00a9

res/xml/apps.xml

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




    <Preference

    <Preference

        android:key="aspect_ratio_apps"

        android:key="aspect_ratio_apps"

        android:title="@string/aspect_ratio_title"

        android:title="@string/aspect_ratio_experimental_title"

        android:summary="@string/summary_placeholder"

        android:summary="@string/summary_placeholder"

        android:order="22"

        android:order="22"

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

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

res/xml/user_aspect_ratio_details.xml

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

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

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

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

    xmlns:app="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

    <com.android.settingslib.widget.ActionButtonsPreference

        android:key="header_view" />

        android:key="header_view" />

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ fun UserAspectRatioAppPreference(app: ApplicationInfo) { 
    if (!presenter.isAvailableFlow.collectAsStateWithLifecycle(initialValue = false).value) return

    if (!presenter.isAvailableFlow.collectAsStateWithLifecycle(initialValue = false).value) return





    Preference(object : PreferenceModel {

    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(

        override val summary = presenter.summaryFlow.collectAsStateWithLifecycle(

            initialValue = stringResource(R.string.summary_placeholder),

            initialValue = stringResource(R.string.summary_placeholder),

        )

        )

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -83,7 +83,7 @@ object UserAspectRatioAppsPageProvider : SettingsPageProvider { 
    @VisibleForTesting

    @VisibleForTesting

    fun EntryItem() =

    fun EntryItem() =

        Preference(object : PreferenceModel {

        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 summary = getSummary().toState()

            override val onClick = navigator(name)

            override val onClick = navigator(name)

        })

        })
@@ -105,7 +105,7 @@ fun UserAspectRatioAppList( 
    = { AppList() },

    = { AppList() },

) {

) {

    AppListPage(

    AppListPage(

        title = stringResource(R.string.aspect_ratio_title),

        title = stringResource(R.string.aspect_ratio_experimental_title),

        listModel = rememberContext(::UserAspectRatioAppListModel),

        listModel = rememberContext(::UserAspectRatioAppListModel),

        appList = appList,

        appList = appList,

        header = {

        header = {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -145,7 +145,7 @@ class UserAspectRatioAppPreferenceTest { 




        composeTestRule.onNode(

        composeTestRule.onNode(

            hasTextExactly(

            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)

                context.getString(R.string.user_aspect_ratio_app_default)

            ),

            ),

        ).assertIsDisplayed().assertIsEnabled()

        ).assertIsDisplayed().assertIsEnabled()