commit f6bafc836e8e8335efc1eacfd832c00b9ac6739e
author Massimo Carli <mcarli@google.com> Fri Sep 22 23:39:24 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 22 23:39:24 2023 +0000
tree 2ef7b0179fa54d9cc010be1ab723d95e365d1931
parent 7cbef7df1f60583b3bc716098d68d1980758b08b
parent 10050559cc8b37846473d0c1198a476832fdf742

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

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

Change-Id: I50a45b2215e701be23cfd67f3ff1a7869a220f0d
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 a570bbb..453a71e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1582,7 +1582,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" />
@@ -1595,7 +1595,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" />