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

Override aspect ratio to fullscreen when unset for universal resizeable

Browse Source 
Bug: 374968702
Test: UserAspectRatioDetailsTest
Test: UserAspectRatioManagerTest
Test: manual, verify which option is selected by default after app
installation
Flag: com.android.window.flags.universal_resizable_by_default

Change-Id: I04063e4a130d42a4bfd7e548940ca5e654a6d012
This commit is contained in:
Marzia Favaro
2024-10-23 10:45:17 +00:00
parent 068ac9d264
commit 215e9c0f3b
2 changed files with 100 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
tests/unit/src/com/android/settings/applications/appcompat/UserAspectRatioManagerTest.java
View File

@@ -331,9 +331,7 @@ public class UserAspectRatioManagerTest {
.isEqualTo(getUserMinAspectRatioEntry(USER_MIN_ASPECT_RATIO_UNSET, mPackageName));
}
@Test
public void testGetUserMinAspectRatioEntry_enabledFullscreenOverride_returnsFullscreen() {
setIsOverrideToFullscreenEnabled(true);
private void assertUnsetIsFullscreen() {
// Fullscreen option is pre-selected
assertThat(getUserMinAspectRatioEntry(USER_MIN_ASPECT_RATIO_UNSET, mPackageName))
.isEqualTo(ResourcesUtils.getResourcesString(
@@ -347,9 +345,7 @@ public class UserAspectRatioManagerTest {
"user_aspect_ratio_app_default"));
}
@Test
public void testGetUserMinAspectRatioEntry_disabledFullscreenOverride_returnsUnchanged() {
setIsOverrideToFullscreenEnabled(false);
private void assertUnsetIsAppDefault() {
// Fullscreen option is not pre-selected
assertThat(getUserMinAspectRatioEntry(USER_MIN_ASPECT_RATIO_UNSET, mPackageName))
.isEqualTo(ResourcesUtils.getResourcesString(
@@ -358,9 +354,43 @@ public class UserAspectRatioManagerTest {
}
@Test
public void testIsOverrideToFullscreenEnabled_returnsTrue()
public void testGetUserMinAspectRatioEntry_enabledFullscreenCompatChange_returnsFullscreen() {
setIsOverrideToFullscreenEnabledBecauseCompatChange(true);
assertUnsetIsFullscreen();
}
@Test
public void testGetUserMinAspectRatioEntry_enabledFullscreenOverrideUniRes_returnsFullscreen() {
setIsOverrideToFullscreenEnabledBecauseUniversalResizeable(true);
assertUnsetIsFullscreen();
}
@Test
public void testGetUserMinAspectRatioEntry_noFullscreenCompatChange_returnsUnchanged() {
setIsOverrideToFullscreenEnabledBecauseCompatChange(false);
assertUnsetIsAppDefault();
}
@Test
public void testGetUserMinAspectRatioEntry_noFullscreenUnivRes_returnsUnchanged() {
setIsOverrideToFullscreenEnabledBecauseUniversalResizeable(false);
assertUnsetIsAppDefault();
}
@Test
public void testIsOverrideToFullscreenEnabledCompatChange_returnsTrue()
throws PackageManager.NameNotFoundException {
setIsOverrideToFullscreenEnabled(true);
setIsOverrideToFullscreenEnabledBecauseCompatChange(true);
assertTrue(mUtils.isOverrideToFullscreenEnabled(mPackageName, mContext.getUserId()));
mockProperty(PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE, true);
assertTrue(mUtils.isOverrideToFullscreenEnabled(mPackageName, mContext.getUserId()));
}
@Test
public void testIsOverrideToFullscreenEnabledUnivRes_returnsTrue()
throws PackageManager.NameNotFoundException {
setIsOverrideToFullscreenEnabledBecauseUniversalResizeable(true);
assertTrue(mUtils.isOverrideToFullscreenEnabled(mPackageName, mContext.getUserId()));
mockProperty(PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE, true);
@@ -370,7 +400,7 @@ public class UserAspectRatioManagerTest {
@Test
public void testIsOverrideToFullscreenEnabled_optOut_returnsFalse()
throws PackageManager.NameNotFoundException {
setIsOverrideToFullscreenEnabled(true);
setIsOverrideToFullscreenEnabledBecauseCompatChange(true);
mockProperty(PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE, false);
assertFalse(mUtils.isOverrideToFullscreenEnabled(mPackageName, mContext.getUserId()));
}
@@ -381,6 +411,12 @@ public class UserAspectRatioManagerTest {
assertFalse(mUtils.isOverrideToFullscreenEnabled(mPackageName, mContext.getUserId()));
}
@Test
public void testIsOverrideToFullscreenEnabledUnivRes_flagDisabled_returnsFalse() {
mUtils.setFullscreenCompatChange(true);
assertFalse(mUtils.isOverrideToFullscreenEnabled(mPackageName, mContext.getUserId()));
}
@Test
public void testIsOverrideToFullscreenEnabled_optionDisabled_returnsFalse() {
mUtils.setFullscreenCompatChange(true);
@@ -389,7 +425,7 @@ public class UserAspectRatioManagerTest {
assertFalse(mUtils.isOverrideToFullscreenEnabled(mPackageName, mContext.getUserId()));
}
private void setIsOverrideToFullscreenEnabled(boolean enabled) {
private void setIsOverrideToFullscreenEnabledBecauseCompatChange(boolean enabled) {
if (enabled) {
mSetFlagsRule.enableFlags(FLAG_USER_MIN_ASPECT_RATIO_APP_DEFAULT);
mUtils = new FakeUserAspectRatioManager(mContext, mIPm);
@@ -399,6 +435,16 @@ public class UserAspectRatioManagerTest {
.thenReturn(enabled);
}
private void setIsOverrideToFullscreenEnabledBecauseUniversalResizeable(boolean enabled) {
if (enabled) {
mSetFlagsRule.enableFlags(FLAG_USER_MIN_ASPECT_RATIO_APP_DEFAULT);
mUtils = new FakeUserAspectRatioManager(mContext, mIPm);
}
mUtils.setUniversalResizeable(enabled);
when(mUtils.hasAspectRatioOption(USER_MIN_ASPECT_RATIO_FULLSCREEN, mPackageName))
.thenReturn(enabled);
}
private void enableAllDefaultAspectRatioOptions() {
final int[] aspectRatioOptions = new int[] {
USER_MIN_ASPECT_RATIO_UNSET,
@@ -457,6 +503,7 @@ public class UserAspectRatioManagerTest {
private static class FakeUserAspectRatioManager extends UserAspectRatioManager {
private boolean mFullscreenCompatChange = false;
private boolean mIsUniversalResizeable = false;
private FakeUserAspectRatioManager(@NonNull Context context, IPackageManager pm) {
super(context, pm);
@@ -467,8 +514,17 @@ public class UserAspectRatioManagerTest {
return mFullscreenCompatChange;
}
@Override
boolean isUniversalResizeable(String pkgName, int userId) {
return mIsUniversalResizeable;
}
void setFullscreenCompatChange(boolean enabled) {
mFullscreenCompatChange = enabled;
}
void setUniversalResizeable(boolean enabled) {
mIsUniversalResizeable = enabled;
}
}
}