Merge "Enable User Aspect Ratio Settings by default" into udc-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
f7a443b419
@@ -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;
|
||||||
|
@@ -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
|
||||||
|
Reference in New Issue
Block a user