| commit | c8bd304d95f4865387fa110f1389736095a33866 | [log] [tgz] |
|---|---|---|
| author | Graciela Putri <gracielawputri@google.com> | Wed Sep 06 03:19:38 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 06 03:19:38 2023 +0000 |
| tree | eeb293b888f30ab0698f37dbb18ea84d5febbdc6 | |
| parent | 4a46f2bc9b07de00b9fcb0b376a70377e0ba5341 [diff] | |
| parent | f7a443b41909119c20f0f525fee882aa1d7df570 [diff] |
Merge "Enable User Aspect Ratio Settings by default" into udc-qpr-dev am: f7a443b419 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24620828 Change-Id: I336e6a719d50ab5bdc841d7e9bb68c6f60e040f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/applications/appcompat/UserAspectRatioManager.java b/src/com/android/settings/applications/appcompat/UserAspectRatioManager.java index 7c16ed6..6bc9658 100644 --- a/src/com/android/settings/applications/appcompat/UserAspectRatioManager.java +++ b/src/com/android/settings/applications/appcompat/UserAspectRatioManager.java
@@ -51,10 +51,10 @@ new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER); // TODO(b/288142656): Enable user aspect ratio settings by default - private static final boolean DEFAULT_VALUE_ENABLE_USER_ASPECT_RATIO_SETTINGS = false; + private static final boolean DEFAULT_VALUE_ENABLE_USER_ASPECT_RATIO_SETTINGS = true; @VisibleForTesting static final String KEY_ENABLE_USER_ASPECT_RATIO_SETTINGS = - "enable_app_compat_user_aspect_ratio_settings"; + "enable_app_compat_aspect_ratio_user_settings"; static final String KEY_ENABLE_USER_ASPECT_RATIO_FULLSCREEN = "enable_app_compat_user_aspect_ratio_fullscreen"; private static final boolean DEFAULT_VALUE_ENABLE_USER_ASPECT_RATIO_FULLSCREEN = true;
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 0235a7b..265d92d 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
@@ -72,7 +72,7 @@ private val resources = context.resources private val aspectRatioEnabledConfig = - TestDeviceConfig(NAMESPACE_WINDOW_MANAGER, "enable_app_compat_user_aspect_ratio_settings") + TestDeviceConfig(NAMESPACE_WINDOW_MANAGER, "enable_app_compat_aspect_ratio_user_settings") @Mock private lateinit var packageManager: PackageManager