PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Graciela Putri
2025-03-11 11:56:04 -07:00
committed by Android (Google) Code Review
parent 34ba944fa0 6ed930462b
commit cf0d8cba31
8 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

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

14
res/values/strings.xml
View File

@@ -13841,20 +13841,6 @@ Data usage charges may apply.</string>
<!-- [CHAR LIMIT=NONE] Warning description for app info aspect ratio page --> <!-- [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> <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] --> <!-- Accessibility label for fingerprint sensor [CHAR LIMIT=NONE] -->
<string name="accessibility_fingerprint_label">Fingerprint sensor</string> <string name="accessibility_fingerprint_label">Fingerprint sensor</string>

2
res/xml/apps.xml
View File

@@ -123,7 +123,7 @@
<Preference <Preference
android:key="aspect_ratio_apps" android:key="aspect_ratio_apps"
android:title="@string/aspect_ratio_experimental_title" android:title="@string/aspect_ratio_title"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:order="22" android:order="22"
settings:controller="com.android.settings.applications.appcompat.UserAspectRatioAppsPreferenceController" settings:controller="com.android.settings.applications.appcompat.UserAspectRatioAppsPreferenceController"

2
res/xml/user_aspect_ratio_details.xml
View File

@@ -19,7 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
xmlns:app="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 <com.android.settingslib.widget.TopIntroPreference
android:key="app_aspect_ratio_summary" android:key="app_aspect_ratio_summary"

2
src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt
View File

@@ -45,7 +45,7 @@ fun UserAspectRatioAppPreference(app: ApplicationInfo) {
initialValue = stringResource(R.string.summary_placeholder), initialValue = stringResource(R.string.summary_placeholder),
) )
Preference(object : PreferenceModel { 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 summary = { summary }
override val onClick = presenter::startActivity override val onClick = presenter::startActivity
}) })

4
src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
View File

@@ -85,7 +85,7 @@ object UserAspectRatioAppsPageProvider : SettingsPageProvider {
fun EntryItem() { fun EntryItem() {
val summary = getSummary() val summary = getSummary()
Preference(object : PreferenceModel { 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 summary = { summary }
override val onClick = navigator(name) override val onClick = navigator(name)
}) })
@@ -108,7 +108,7 @@ fun UserAspectRatioAppList(
= { AppList() }, = { AppList() },
) { ) {
AppListPage( AppListPage(
title = stringResource(R.string.aspect_ratio_experimental_title), title = stringResource(R.string.aspect_ratio_title),
listModel = rememberContext(::UserAspectRatioAppListModel), listModel = rememberContext(::UserAspectRatioAppListModel),
appList = appList, appList = appList,
header = { header = {

2
tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreferenceTest.kt
View File

@@ -155,7 +155,7 @@ class UserAspectRatioAppPreferenceTest {
composeTestRule.onNode( composeTestRule.onNode(
hasTextExactly( 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) context.getString(R.string.user_aspect_ratio_app_default)
), ),
).assertIsDisplayed().assertIsEnabled() ).assertIsDisplayed().assertIsEnabled()

6
tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt
View File

@@ -63,7 +63,7 @@ class UserAspectRatioAppsPageProviderTest {
@Test @Test
fun injectEntry_title() { fun injectEntry_title() {
setInjectEntry() setInjectEntry()
composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_experimental_title)) composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_title))
.assertIsDisplayed() .assertIsDisplayed()
} }
@@ -78,7 +78,7 @@ class UserAspectRatioAppsPageProviderTest {
@Test @Test
fun injectEntry_onClick_navigate() { fun injectEntry_onClick_navigate() {
setInjectEntry() setInjectEntry()
composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_experimental_title)) composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_title))
.performClick() .performClick()
assertThat(fakeNavControllerWrapper.navigateCalledWith).isEqualTo("UserAspectRatioAppsPage") assertThat(fakeNavControllerWrapper.navigateCalledWith).isEqualTo("UserAspectRatioAppsPage")
} }
@@ -97,7 +97,7 @@ class UserAspectRatioAppsPageProviderTest {
UserAspectRatioAppList {} UserAspectRatioAppList {}
} }
composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_experimental_title)) composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_title))
.assertIsDisplayed() .assertIsDisplayed()
} }