Merge "Remove (experimental) from app aspect ratio settings title" into main
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bbe7963..8f5699c 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 4d763f3..b6d53ee 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -13841,20 +13841,6 @@
<!-- [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 77b210f..b687497 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 24c3271..af3d2d5 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 1e6e545..cbd9c53 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 @@
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 3241d71..5902677 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 @@
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 @@
= { 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 15fe091..82642ee 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 @@
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 b859df4..1549994 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 @@
@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 @@
@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 @@
UserAspectRatioAppList {}
}
- composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_experimental_title))
+ composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_title))
.assertIsDisplayed()
}