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"/> + + + + + + + + + + + android:title="@string/aspect_ratio_experimental_title"> diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index a1a7cdae694..60a5b808c82 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -363,6 +363,8 @@ public class Settings extends SettingsActivity { public static class ClonedAppsListActivity extends SettingsActivity { /* empty */ } /** Activity to manage Aspect Ratio app list page */ public static class UserAspectRatioAppListActivity extends SettingsActivity { /* empty */ } + /** Activity to manage Aspect Ratio app page */ + public static class UserAspectRatioAppActivity extends SettingsActivity { /* empty */ } public static class NotificationReviewPermissionsActivity extends SettingsActivity { /* empty */ } public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ } public static class ChannelNotificationSettingsActivity extends SettingsActivity { /* empty */ } diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java index 3100706bf26..7b1abaf8b24 100644 --- a/src/com/android/settings/core/gateway/SettingsGateway.java +++ b/src/com/android/settings/core/gateway/SettingsGateway.java @@ -42,6 +42,7 @@ import com.android.settings.applications.AppDashboardFragment; import com.android.settings.applications.ProcessStatsSummary; import com.android.settings.applications.ProcessStatsUi; import com.android.settings.applications.UsageAccessDetails; +import com.android.settings.applications.appcompat.UserAspectRatioDetails; import com.android.settings.applications.appinfo.AlarmsAndRemindersDetails; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.applications.appinfo.AppLocaleDetails; @@ -375,7 +376,8 @@ public class SettingsGateway { ColorAndMotionFragment.class.getName(), LongBackgroundTasksDetails.class.getName(), RegionalPreferencesEntriesFragment.class.getName(), - BatteryInfoFragment.class.getName() + BatteryInfoFragment.class.getName(), + UserAspectRatioDetails.class.getName() }; public static final String[] SETTINGS_FOR_RESTRICTED = { 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..9a17032d3e8 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)) @@ -145,7 +142,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() @@ -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)) 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() }