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

Commit f7a443b4 authored by Graciela Putri's avatar Graciela Putri Committed by Android (Google) Code Review
Browse files

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

parents 60afc125 70ca63e4
Loading
Loading
Loading
Loading
+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;
+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