From 6ed930462b018c0021fabf98a876418729e5f16c Mon Sep 17 00:00:00 2001
From: Graciela Putri <gracielawputri@google.com>
Date: Thu, 6 Mar 2025 03:36:22 -0800
Subject: [PATCH] Remove (experimental) from app aspect ratio settings title

Flag: EXEMPT string change
Fix: 305215544
Test: m
Change-Id: Idbb01ec99014efc40c285212e5e6ef8c91fa8333
---
 AndroidManifest.xml                                |  4 ++--
 res/values/strings.xml                             | 14 --------------
 res/xml/apps.xml                                   |  2 +-
 res/xml/user_aspect_ratio_details.xml              |  2 +-
 .../app/appcompat/UserAspectRatioAppPreference.kt  |  2 +-
 .../appcompat/UserAspectRatioAppsPageProvider.kt   |  4 ++--
 .../appcompat/UserAspectRatioAppPreferenceTest.kt  |  2 +-
 .../UserAspectRatioAppsPageProviderTest.kt         |  6 +++---
 8 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bbe796320c2..8f5699c7572 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2958559101a..de844f2be9d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -13830,20 +13830,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>
 
diff --git a/res/xml/apps.xml b/res/xml/apps.xml
index 77b210f1821..b6874973b22 100644
--- a/res/xml/apps.xml
+++ b/res/xml/apps.xml
@@ -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"
diff --git a/res/xml/user_aspect_ratio_details.xml b/res/xml/user_aspect_ratio_details.xml
index 24c32718468..af3d2d5bd03 100644
--- a/res/xml/user_aspect_ratio_details.xml
+++ b/res/xml/user_aspect_ratio_details.xml
@@ -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"
diff --git a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt
index 1e6e54599cb..cbd9c530801 100644
--- a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt
+++ b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt
@@ -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
     })
diff --git a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
index 3241d713cf4..59026774afe 100644
--- a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
+++ b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
@@ -85,7 +85,7 @@ object UserAspectRatioAppsPageProvider : SettingsPageProvider {
     fun EntryItem() {
         val summary = getSummary()
         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 = navigator(name)
         })
@@ -108,7 +108,7 @@ fun UserAspectRatioAppList(
     = { AppList() },
 ) {
     AppListPage(
-        title = stringResource(R.string.aspect_ratio_experimental_title),
+        title = stringResource(R.string.aspect_ratio_title),
         listModel = rememberContext(::UserAspectRatioAppListModel),
         appList = appList,
         header = {
diff --git a/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreferenceTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreferenceTest.kt
index 15fe091ef43..82642ee0277 100644
--- a/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreferenceTest.kt
+++ b/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreferenceTest.kt
@@ -155,7 +155,7 @@ class UserAspectRatioAppPreferenceTest {
 
         composeTestRule.onNode(
             hasTextExactly(
-                context.getString(R.string.aspect_ratio_experimental_title),
+                context.getString(R.string.aspect_ratio_title),
                 context.getString(R.string.user_aspect_ratio_app_default)
             ),
         ).assertIsDisplayed().assertIsEnabled()
diff --git a/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt
index b859df457ac..15499948eac 100644
--- a/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt
+++ b/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt
@@ -63,7 +63,7 @@ class UserAspectRatioAppsPageProviderTest {
     @Test
     fun injectEntry_title() {
         setInjectEntry()
-        composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_experimental_title))
+        composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_title))
             .assertIsDisplayed()
     }
 
@@ -78,7 +78,7 @@ class UserAspectRatioAppsPageProviderTest {
     @Test
     fun injectEntry_onClick_navigate() {
         setInjectEntry()
-        composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_experimental_title))
+        composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_title))
             .performClick()
         assertThat(fakeNavControllerWrapper.navigateCalledWith).isEqualTo("UserAspectRatioAppsPage")
     }
@@ -97,7 +97,7 @@ class UserAspectRatioAppsPageProviderTest {
             UserAspectRatioAppList {}
         }
 
-        composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_experimental_title))
+        composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_title))
             .assertIsDisplayed()
     }