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

Commit 7d297719 authored by Massimo Carli's avatar Massimo Carli Committed by Automerger Merge Worker
Browse files

Merge "Changed app string changes in user aspect ratio settings" into udc-qpr-dev am: 951bbde3 

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



Change-Id: I8e95d9e9704649cbcb3eed980e3d0275116b4c1a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents de41256d 951bbde3

res/values/strings.xml

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

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

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

    <!-- [CHAR LIMIT=NONE] Filter label for apps that have user aspect ratio override applied -->

    <string name="user_aspect_ratio_overridden_apps_label">Apps you have overridden</string>

    <!-- [CHAR LIMIT=14] Filter label for apps that have user aspect ratio changed -->

    <string name="user_aspect_ratio_changed_apps_label">Changed apps</string>

    <!-- [CHAR LIMIT=NONE] App default aspect ratio entry -->

    <string name="user_aspect_ratio_app_default">App default</string>

    <!-- [CHAR LIMIT=NONE] Fullscreen aspect ratio entry -->

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

+1 −1
Original line number Diff line number Diff line
@@ -215,5 +215,5 @@ class UserAspectRatioAppListModel(private val context: Context) 
private enum class SpinnerItem(val stringResId: Int) {

    Suggested(R.string.user_aspect_ratio_suggested_apps_label),

    All(R.string.filter_all_apps),

    Overridden(R.string.user_aspect_ratio_overridden_apps_label)

    Overridden(R.string.user_aspect_ratio_changed_apps_label)

}
 
 No newline at end of file