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

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

Merge "[3/n] Add aspect ratio app info page" into udc-qpr-dev am: 386b02e9 

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



Change-Id: I5f187502bc04d21629bdc1b434f74497f9def14a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 676af6a9 386b02e9

res/values/config.xml

+4 −3
Original line number Diff line number Diff line
@@ -611,23 +611,24 @@ 
        <item>3</item>

    </integer-array>



    <!-- TODO(b/287448187): add USER_MIN_ASPECT_RATIO_DISPLAY_SIZE entry -->

    <!-- App screen size settings screen, User aspect ratio override options. Must be the same

    <!-- App aspect ratio settings screen, user aspect ratio override options. Must be the same

         length and order as config_userAspectRatioOverrideValues below. -->

    <string-array name="config_userAspectRatioOverrideEntries" translatable="false">

        <item>@string/user_aspect_ratio_app_default</item>

        <item>@string/user_aspect_ratio_half_screen</item>

        <item>@string/user_aspect_ratio_device_size</item>

        <item>@string/user_aspect_ratio_16_9</item>

        <item>@string/user_aspect_ratio_4_3</item>

        <item>@string/user_aspect_ratio_3_2</item>

    </string-array>



    <!-- App screen size settings screen, User aspect ratio override options. Must be the same

    <!-- App aspect ratio settings screen, user aspect ratio override options. Must be the same

         length and order as config_userAspectRatioOverrideEntries above. The values must

         correspond to PackageManager.UserMinAspectRatio -->

    <integer-array name="config_userAspectRatioOverrideValues" translatable="false">

        <item>0</item> <!-- USER_MIN_ASPECT_RATIO_UNSET -->

        <item>1</item> <!-- USER_MIN_ASPECT_RATIO_SPLIT_SCREEN -->

        <item>2</item> <!-- USER_MIN_ASPECT_RATIO_DISPLAY_SIZE -->

        <item>4</item> <!-- USER_MIN_ASPECT_RATIO_16_9 -->

        <item>3</item> <!-- USER_MIN_ASPECT_RATIO_4_3 -->

        <item>5</item> <!-- USER_MIN_ASPECT_RATIO_3_2 -->

res/values/strings.xml

+12 −7
Original line number Diff line number Diff line
@@ -12081,25 +12081,30 @@ 
    other {Apps installed more than # months ago}

    }</string>









    <!-- App Screen Size (User Aspect Ratio Override) -->









    <!-- [CHAR LIMIT=60] Screen size app list title setting to choose aspect ratio -->









    <string name="screen_size_title">Screen size</string>









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









    <string name="screen_size_summary">Choose an aspect ratio for apps if they haven’t been optimized for your <xliff:g id="device_name">%1$s</xliff:g></string>









    <!-- App Aspect Ratio (User Aspect Ratio Override) -->









    <!-- [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>









    <!-- [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=NONE] App default aspect ratio entry -->









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









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









    <string name="user_aspect_ratio_half_screen">Half-screen</string>









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









    <string name="user_aspect_ratio_half_screen">Half screen</string>









    <!-- [CHAR LIMIT=NONE] Device display size aspect ratio entry -->









    <string name="user_aspect_ratio_device_size">Device aspect ratio</string>









    <!-- [CHAR LIMIT=NONE] 16:9 aspect ratio entry -->









    <string name="user_aspect_ratio_16_9">16:9</string>









    <!-- [CHAR LIMIT=NONE] 3:2 aspect ratio entry -->









    <string name="user_aspect_ratio_3_2">3:2</string>









    <!-- [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>

























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









    <string name="accessibility_fingerprint_label">Fingerprint sensor</string>

























res/xml/apps.xml



+1
−1






























Original line number
Diff line number
Diff line







@@ -81,7 +81,7 @@

















    <Preference









        android:key="aspect_ratio_apps"









        android:title="@string/screen_size_title"









        android:title="@string/aspect_ratio_title"









        android:summary="@string/summary_placeholder"









        android:order="14"









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
































res/xml/user_aspect_ratio_details.xml
0 → 100644



+55
−0






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!--









  ~ Copyright (C) 2023 The Android Open Source Project









  ~









  ~ Licensed under the Apache License, Version 2.0 (the "License");









  ~ you may not use this file except in compliance with the License.









  ~ You may obtain a copy of the License at









  ~









  ~      http://www.apache.org/licenses/LICENSE-2.0









  ~









  ~ Unless required by applicable law or agreed to in writing, software









  ~ distributed under the License is distributed on an "AS IS" BASIS,









  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.









  ~ See the License for the specific language governing permissions and









  ~ limitations under the License.









  -->



















<PreferenceScreen









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









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









    android:title="@string/aspect_ratio_title">



















    <com.android.settingslib.widget.ActionButtonsPreference









        android:key="header_view" />



















    <com.android.settingslib.widget.SelectorWithWidgetPreference









        android:key="app_default_pref"









        android:title="@string/user_aspect_ratio_app_default"/>



















    <com.android.settingslib.widget.SelectorWithWidgetPreference









        android:key="half_screen_pref"









        android:title="@string/user_aspect_ratio_half_screen"/>



















    <com.android.settingslib.widget.SelectorWithWidgetPreference









        android:key="display_size_pref"









        android:title="@string/user_aspect_ratio_device_size"/>



















    <com.android.settingslib.widget.SelectorWithWidgetPreference









        android:key="16_9_pref"









        android:title="@string/user_aspect_ratio_16_9"/>



















    <com.android.settingslib.widget.SelectorWithWidgetPreference









        android:key="4_3_pref"









        android:title="@string/user_aspect_ratio_4_3"/>



















    <com.android.settingslib.widget.SelectorWithWidgetPreference









        android:key="3_2_pref"









        android:title="@string/user_aspect_ratio_3_2"/>



















    <com.android.settingslib.widget.FooterPreference









        android:title="@string/app_aspect_ratio_footer"









        android:selectable="false"









        settings:searchable="false"/>



















</PreferenceScreen>








 No newline at end of file
























src/com/android/settings/applications/appcompat/UserAspectRatioAppsPreferenceController.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -43,6 +43,6 @@ public class UserAspectRatioAppsPreferenceController extends BasePreferenceContr

















    @Override









    public CharSequence getSummary() {









        return mContext.getResources().getString(R.string.screen_size_summary, Build.MODEL);









        return mContext.getResources().getString(R.string.aspect_ratio_summary, Build.MODEL);









    }









}