Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e571e55 authored by Graciela Putri's avatar Graciela Putri Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I3d5ad3abc86cf3bdb85c031bdee154708985176d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1d7a5e12 c8bd304d

src/com/android/settings/applications/appcompat/UserAspectRatioManager.java

+2 −2
Original line number Diff line number Diff line
@@ -51,10 +51,10 @@ public class UserAspectRatioManager { 
            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;

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

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class UserAspectRatioAppPreferenceTest { 
    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