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

Merge "Enable User Aspect Ratio Settings by default" into udc-qpr-dev am: f7a443b419

Browse Source 
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>
This commit is contained in:
Graciela Putri
2023-09-06 03:19:38 +00:00
committed by Automerger Merge Worker
parent 4a46f2bc9b f7a443b419
commit c8bd304d95
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/applications/appcompat/UserAspectRatioManager.java
View File

@@ -51,10 +51,10 @@ public class UserAspectRatioManager {
new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER); new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER);
// TODO(b/288142656): Enable user aspect ratio settings by default // 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 @VisibleForTesting
static final String KEY_ENABLE_USER_ASPECT_RATIO_SETTINGS = 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 = static final String KEY_ENABLE_USER_ASPECT_RATIO_FULLSCREEN =
"enable_app_compat_user_aspect_ratio_fullscreen"; "enable_app_compat_user_aspect_ratio_fullscreen";
private static final boolean DEFAULT_VALUE_ENABLE_USER_ASPECT_RATIO_FULLSCREEN = true; private static final boolean DEFAULT_VALUE_ENABLE_USER_ASPECT_RATIO_FULLSCREEN = true;

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

@@ -72,7 +72,7 @@ class UserAspectRatioAppPreferenceTest {
private val resources = context.resources private val resources = context.resources
private val aspectRatioEnabledConfig = 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 @Mock
private lateinit var packageManager: PackageManager private lateinit var packageManager: PackageManager