commit ea28ebdc1b1f846bd5281f5ef486f56a497d48c9
author Massimo Carli <mcarli@google.com> Sat Sep 23 00:35:43 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Sep 23 00:35:43 2023 +0000
tree 2b23099db54b90fb94cbf5d6125c8f317caeb86c
parent 30ffee860002f20d9cd658ca6484b63a8edb7481
parent f6bafc836e8e8335efc1eacfd832c00b9ac6739e

Merge "Use experimental string in  user aspect ratio settings" into udc-qpr-dev am: 10050559cc am: f6bafc836e

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

Change-Id: I768fd7baef049d3243ca01f0b0bd2eb6aa19d8e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a15b4ea..5978f04 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1568,7 +1568,7 @@
 
         <activity android:name="Settings$UserAspectRatioAppListActivity"
             android:exported="true"
-            android:label="@string/aspect_ratio_title">
+            android:label="@string/aspect_ratio_experimental_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS"/>
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1581,7 +1581,7 @@
 
         <activity android:name="Settings$UserAspectRatioAppActivity"
                   android:exported="true"
-                  android:label="@string/aspect_ratio_title">
+                  android:label="@string/aspect_ratio_experimental_title">
             <intent-filter>
                 <action android:name="android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />