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

Commit cf0d8cba authored by Graciela Putri's avatar Graciela Putri Committed by Android (Google) Code Review
Browse files

Merge "Remove (experimental) from app aspect ratio settings title" into main

parents 34ba944f 6ed93046
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -1899,7 +1899,7 @@

        <activity android:name="Settings$UserAspectRatioAppListActivity"
            android:exported="true"
            android:label="@string/aspect_ratio_experimental_title">
            android:label="@string/aspect_ratio_title">
            <intent-filter android:priority="1">
                <action android:name="android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS"/>
                <category android:name="android.intent.category.DEFAULT" />
@@ -1912,7 +1912,7 @@

        <activity android:name="Settings$UserAspectRatioAppActivity"
                  android:exported="true"
                  android:label="@string/aspect_ratio_experimental_title">
                  android:label="@string/aspect_ratio_title">
            <intent-filter>
                <action android:name="android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS" />
                <category android:name="android.intent.category.DEFAULT" />
+0 −14
Original line number Diff line number Diff line
@@ -13841,20 +13841,6 @@ Data usage charges may apply.</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. Some apps may not be optimized for certain aspect ratios.</string>
    <!-- TODO(b/300219974): Change aspect ratio title and clean up unused titles -->
    <!-- [CHAR LIMIT=60] Aspect ratio experimental title settings to choose app aspect ratio -->
    <string name="aspect_ratio_experimental_title">Aspect ratio (experimental)</string>
    <!-- [CHAR LIMIT=60] Aspect ratio experiment title settings to choose app aspect ratio -->
    <string name="aspect_ratio_experiment_title">Aspect ratio (experiment)</string>
    <!-- [CHAR LIMIT=60] Aspect ratio labs title settings to choose app aspect ratio -->
    <string name="aspect_ratio_labs_title">Aspect ratio (labs)</string>
    <!-- [CHAR LIMIT=60] Aspect ratio experimental title label -->
    <string name="aspect_ratio_experimental_label">Experimental</string>
    <!-- [CHAR LIMIT=60] Aspect ratio experiment title label -->
    <string name="aspect_ratio_experiment_label">Experiment</string>
    <!-- [CHAR LIMIT=60] Aspect ratio labs title label -->
    <string name="aspect_ratio_labs_label">Labs</string>
    <!-- Accessibility label for fingerprint sensor [CHAR LIMIT=NONE] -->
    <string name="accessibility_fingerprint_label">Fingerprint sensor</string>
+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@

        <Preference
            android:key="aspect_ratio_apps"
            android:title="@string/aspect_ratio_experimental_title"
            android:title="@string/aspect_ratio_title"
            android:summary="@string/summary_placeholder"
            android:order="22"
            settings:controller="com.android.settings.applications.appcompat.UserAspectRatioAppsPreferenceController"
+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:settings="http://schemas.android.com/apk/res-auto"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:title="@string/aspect_ratio_experimental_title">
    android:title="@string/aspect_ratio_title">

    <com.android.settingslib.widget.TopIntroPreference
        android:key="app_aspect_ratio_summary"
+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ fun UserAspectRatioAppPreference(app: ApplicationInfo) {
        initialValue = stringResource(R.string.summary_placeholder),
    )
    Preference(object : PreferenceModel {
        override val title = stringResource(R.string.aspect_ratio_experimental_title)
        override val title = stringResource(R.string.aspect_ratio_title)
        override val summary = { summary }
        override val onClick = presenter::startActivity
    })
Loading