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

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

Merge "Change aspect ratio summary and footer text" into udc-qpr-dev am: dd34fa54 

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



Change-Id: I1fcf366127ea502b3351c8f6a94d601281df4a54
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9e4fed1b dd34fa54

res/values/strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -12144,7 +12144,9 @@ 
    <!-- [CHAR LIMIT=60] Aspect ratio title setting to choose app aspect ratio -->

    <string name="aspect_ratio_title">Aspect ratio</string>

    <!-- [CHAR LIMIT=NONE] Aspect ratio setting summary to choose aspect ratio for apps unoptimized for device -->

    <string name="aspect_ratio_summary">Choose an aspect ratio to view this app if it hasn\'t been designed to fit your <xliff:g id="device_name">%1$s</xliff:g></string>

    <string name="aspect_ratio_summary">Try a new aspect ratio to view this app if it hasn\'t been designed to fit your <xliff:g id="device_name">%1$s</xliff:g></string>

    <!-- [CHAR LIMIT=NONE] Aspect ratio setting main summary on page to choose aspect ratio for apps unoptimized for device -->

    <string name="aspect_ratio_main_summary">Try a new aspect ratio to view this app if it hasn\'t been designed to fit your <xliff:g id="device_name">%1$s</xliff:g>. Some apps may not be optimized for certain aspect ratios.</string>

    <!-- [CHAR LIMIT=NONE] Aspect ratio suggested apps filter label -->

    <string name="user_aspect_ratio_suggested_apps_label">Suggested apps</string>

    <!-- [CHAR LIMIT=14] Filter label for apps that have user aspect ratio changed -->
@@ -12164,7 +12166,7 @@ 
    <!-- [CHAR LIMIT=NONE] 4:3 aspect ratio entry -->

    <string name="user_aspect_ratio_4_3">4:3</string>

    <!-- [CHAR LIMIT=NONE] Warning description for app info aspect ratio page -->

    <string name="app_aspect_ratio_footer">The app will restart when you change aspect ratio. You may lose unsaved changes.</string>

    <string name="app_aspect_ratio_footer">The app will restart when you change aspect ratio. You may lose unsaved changes. Some apps may not be optimized for certain aspect ratios.</string>





























    <!-- Accessibility label for fingerprint sensor [CHAR LIMIT=NONE] -->

























res/xml/apps.xml



+19
−12




























Original line number
Diff line number
Diff line








@@ -79,18 +79,6 @@













        android:key="dashboard_tile_placeholder"















        android:order="10"/>





























    <Preference













        android:key="aspect_ratio_apps"













        android:title="@string/aspect_ratio_title"













        android:summary="@string/summary_placeholder"













        android:order="14"













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













        android:fragment="com.android.settings.applications.manageapplications.ManageApplications">













        <extra android:name="classname"













               android:value="com.android.settings.Settings$UserAspectRatioAppListActivity"/>













        <intent android:action="android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS"/>













    </Preference>





























    <Preference















        android:key="hibernated_apps"















        android:title="@string/unused_apps"










@@ -119,4 +107,23 @@













        android:title="@string/special_access"















        android:order="20"/>





























    <PreferenceCategory













        android:key="advanced_category"













        android:title="@string/advanced_apps"













        android:order="21"













        android:visibility="gone"













        settings:searchable="false"/>



























    <Preference













        android:key="aspect_ratio_apps"













        android:title="@string/aspect_ratio_title"













        android:summary="@string/summary_placeholder"













        android:order="22"













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













        android:fragment="com.android.settings.applications.manageapplications.ManageApplications">













        <extra android:name="classname"













               android:value="com.android.settings.Settings$UserAspectRatioAppListActivity"/>













        <intent android:action="android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS"/>













    </Preference>





























</PreferenceScreen>
























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



+1
−1




























Original line number
Diff line number
Diff line








@@ -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

































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



+2
−1




























Original line number
Diff line number
Diff line








@@ -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()















    }