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

Merge "Change title to aspect ratio (experimental)" into udc-qpr-dev am: f1c7bf3440

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

Change-Id: Ic630fd0179a9fd06a03df3a9b85ec38b021ac665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Graciela Putri
2023-09-21 19:37:40 +00:00
committed by Automerger Merge Worker
parent ed59726c6e f1c7bf3440
commit 12867d5a88
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/apps.xml
View File

@@ -116,7 +116,7 @@
<Preference <Preference
android:key="aspect_ratio_apps" android:key="aspect_ratio_apps"
android:title="@string/aspect_ratio_title" android:title="@string/aspect_ratio_experimental_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_title"> android:title="@string/aspect_ratio_experimental_title">
<com.android.settingslib.widget.ActionButtonsPreference <com.android.settingslib.widget.ActionButtonsPreference
android:key="header_view" /> android:key="header_view" />

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

@@ -41,7 +41,7 @@ fun UserAspectRatioAppPreference(app: ApplicationInfo) {
if (!presenter.isAvailableFlow.collectAsStateWithLifecycle(initialValue = false).value) return if (!presenter.isAvailableFlow.collectAsStateWithLifecycle(initialValue = false).value) return
Preference(object : PreferenceModel { Preference(object : PreferenceModel {
override val title = stringResource(R.string.aspect_ratio_title) override val title = stringResource(R.string.aspect_ratio_experimental_title)
override val summary = presenter.summaryFlow.collectAsStateWithLifecycle( override val summary = presenter.summaryFlow.collectAsStateWithLifecycle(
initialValue = stringResource(R.string.summary_placeholder), initialValue = stringResource(R.string.summary_placeholder),
) )

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

@@ -82,7 +82,7 @@ object UserAspectRatioAppsPageProvider : SettingsPageProvider {
@VisibleForTesting @VisibleForTesting
fun EntryItem() = fun EntryItem() =
Preference(object : PreferenceModel { Preference(object : PreferenceModel {
override val title = stringResource(R.string.aspect_ratio_title) override val title = stringResource(R.string.aspect_ratio_experimental_title)
override val summary = getSummary().toState() override val summary = getSummary().toState()
override val onClick = navigator(name) override val onClick = navigator(name)
}) })
@@ -104,7 +104,7 @@ fun UserAspectRatioAppList(
= { AppList() }, = { AppList() },
) { ) {
AppListPage( AppListPage(
title = stringResource(R.string.aspect_ratio_title), title = stringResource(R.string.aspect_ratio_experimental_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

@@ -145,7 +145,7 @@ class UserAspectRatioAppPreferenceTest {
composeTestRule.onNode( composeTestRule.onNode(
hasTextExactly( hasTextExactly(
context.getString(R.string.aspect_ratio_title), context.getString(R.string.aspect_ratio_experimental_title),
context.getString(R.string.user_aspect_ratio_app_default) context.getString(R.string.user_aspect_ratio_app_default)
), ),
).assertIsDisplayed().assertIsEnabled() ).assertIsDisplayed().assertIsEnabled()

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

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