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

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

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

Change-Id: I1fcf366127ea502b3351c8f6a94d601281df4a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Graciela Putri
2023-09-13 07:58:10 +00:00
committed by Automerger Merge Worker
parent 9e4fed1b62 dd34fa54e4
commit f862ff58f0
4 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

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

31
res/xml/apps.xml
View File

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

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

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

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

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