From bbb58cac694324d72ad9d3a3a3cb19fc48c10bb0 Mon Sep 17 00:00:00 2001 From: Graciela Wissen Putri Date: Wed, 20 Sep 2023 16:57:43 +0000 Subject: [PATCH 1/3] Change title to aspect ratio (experimental) Settings > Apps > Aspect ratio (experimental) Settings > Apps > App info > Aspect ratio (experimental) Fix: 300219974 Test: Manual && atest SettingsSpaUnitTests Merged-In: I359c744025232c6a6ebd9628dbf91acac85b53e9 Change-Id: I359c744025232c6a6ebd9628dbf91acac85b53e9 --- res/xml/apps.xml | 2 +- res/xml/user_aspect_ratio_details.xml | 2 +- .../spa/app/appcompat/UserAspectRatioAppPreference.kt | 2 +- .../spa/app/appcompat/UserAspectRatioAppsPageProvider.kt | 4 ++-- .../spa/app/appcompat/UserAspectRatioAppPreferenceTest.kt | 2 +- .../app/appcompat/UserAspectRatioAppsPageProviderTest.kt | 7 ++++--- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/res/xml/apps.xml b/res/xml/apps.xml index db46a1a7265..90c40a691ba 100644 --- a/res/xml/apps.xml +++ b/res/xml/apps.xml @@ -116,7 +116,7 @@ + android:title="@string/aspect_ratio_experimental_title"> diff --git a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt index 3680715705e..05da903120b 100644 --- a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt +++ b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt @@ -43,7 +43,7 @@ fun UserAspectRatioAppPreference(app: ApplicationInfo) { if (!presenter.isAvailableFlow.collectAsStateWithLifecycle(initialValue = false).value) return 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( initialValue = stringResource(R.string.summary_placeholder), ) diff --git a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt index 069be0110ec..012182601de 100644 --- a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt +++ b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt @@ -83,7 +83,7 @@ object UserAspectRatioAppsPageProvider : SettingsPageProvider { @VisibleForTesting fun EntryItem() = 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 onClick = navigator(name) }) @@ -105,7 +105,7 @@ fun UserAspectRatioAppList( = { AppList() }, ) { AppListPage( - title = stringResource(R.string.aspect_ratio_title), + title = stringResource(R.string.aspect_ratio_experimental_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 265d92d32ca..46ee3f19b05 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 @@ -145,7 +145,7 @@ class UserAspectRatioAppPreferenceTest { composeTestRule.onNode( 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) ), ).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 044968d75e3..98b393eb614 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 @@ -60,7 +60,7 @@ class UserAspectRatioAppsPageProviderTest { @Test fun injectEntry_title() { setInjectEntry() - composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_title)) + composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_experimental_title)) .assertIsDisplayed() } @@ -75,7 +75,8 @@ class UserAspectRatioAppsPageProviderTest { @Test fun injectEntry_onClick_navigate() { 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") } @@ -93,7 +94,7 @@ class UserAspectRatioAppsPageProviderTest { UserAspectRatioAppList {} } - composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_title)) + composeTestRule.onNodeWithText(context.getString(R.string.aspect_ratio_experimental_title)) .assertIsDisplayed() } From 1dc175123a9f194e698157d21abad71a5cf3cb8f Mon Sep 17 00:00:00 2001 From: Massimo Carli Date: Thu, 21 Sep 2023 10:33:57 +0000 Subject: [PATCH 2/3] Add user aspect ratio detail destination to settings When an intent with action android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS and data with scheme "package:" is launched, the UserAspectRatioDetails is shown in settings Fix: 296564769 Test: Manual Change-Id: I3667ece595ad76c694342de934051893e1e0a1d3 --- AndroidManifest.xml | 14 ++++++++++++++ src/com/android/settings/Settings.java | 2 ++ .../settings/core/gateway/SettingsGateway.java | 4 +++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3529b0b3129..a570bbb6670 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1593,6 +1593,20 @@ android:value="@string/menu_key_apps"/> + + + + + + + + + + Date: Thu, 21 Sep 2023 13:33:06 +0000 Subject: [PATCH 3/3] Fix null object ref in UserAspectRatioAppPreferenceTest Fix: 300651879 Test: atest UserAspectRatioAppPreferenceTest Change-Id: I7afb90ecd7038e742b2b5ee5b4af5d6ecb4c7a4e --- .../app/appcompat/UserAspectRatioAppPreferenceTest.kt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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 265d92d32ca..4ec4f7afe98 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 @@ -37,7 +37,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.dx.mockito.inline.extended.ExtendedMockito import com.android.settings.R import com.android.settings.applications.appcompat.UserAspectRatioDetails -import com.android.settings.applications.appcompat.UserAspectRatioManager import com.android.settings.applications.appinfo.AppInfoDashboardFragment import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider import com.android.settings.testutils.TestDeviceConfig @@ -87,6 +86,8 @@ class UserAspectRatioAppPreferenceTest { .startMocking() whenever(context.resources).thenReturn(resources) whenever(context.packageManager).thenReturn(packageManager) + // True is ignored but need this here or getBoolean will complain null object + mockProperty(PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE, true) } @After @@ -124,8 +125,6 @@ class UserAspectRatioAppPreferenceTest { @Test fun whenCannotDisplayAspectRatioUiAndConfigTrue_notDisplayed() { - // True is ignored but need this here or getBoolean will complain null object - mockProperty(PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE, true) setConfig(true) setContent() @@ -135,8 +134,6 @@ class UserAspectRatioAppPreferenceTest { @Test fun whenCanDisplayAspectRatioUiAndConfigTrue_Displayed() { - // True is ignored but need this here or getBoolean will complain null object - mockProperty(PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE, true) setConfig(true) whenever(packageManager.queryIntentActivities(any(), anyInt())) .thenReturn(listOf(RESOLVE_INFO)) @@ -153,8 +150,6 @@ class UserAspectRatioAppPreferenceTest { @Test fun onClick_startActivity() { - // True is ignored but need this here or getBoolean will complain null object - mockProperty(PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE, true) setConfig(true) whenever(packageManager.queryIntentActivities(any(), anyInt())) .thenReturn(listOf(RESOLVE_INFO))