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

Merge "UserAspectRatioManager call AtivityRecord#canBeUniversalResizeable" into main

Browse Source
This commit is contained in:
Marzia Favaro
2025-01-24 02:46:03 -08:00
committed by Android (Google) Code Review
parent 1cf3f07163 cc4d5a3b6a
commit 271fb3ea63
2 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,12 +40,14 @@ import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.app.ActivityTaskManager;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageManager;
@@ -88,6 +90,7 @@ public class UserAspectRatioManagerTest {
private String mOriginalFullscreenFlag;
private IPackageManager mIPm;
private PackageManager mPm;
private ActivityTaskManager mActivityTaskManager;
private List<LauncherActivityInfo> mLauncherActivities;
@Before
@@ -98,13 +101,15 @@ public class UserAspectRatioManagerTest {
mLauncherActivities = mock(List.class);
mIPm = mock(IPackageManager.class);
mPm = mock(PackageManager.class);
mActivityTaskManager = mock(ActivityTaskManager.class);
when(mActivityTaskManager.canBeUniversalResizeable(any())).thenReturn(false);
when(mContext.getPackageManager()).thenReturn(mPm);
when(mContext.getResources()).thenReturn(mResources);
when(mContext.getSystemService(LauncherApps.class)).thenReturn(launcherApps);
enableAllDefaultAspectRatioOptions();
mUtils = new FakeUserAspectRatioManager(mContext, mIPm);
mUtils = new FakeUserAspectRatioManager(mContext, mIPm, mActivityTaskManager);
doReturn(mLauncherActivities).when(launcherApps).getActivityList(anyString(), any());
@@ -293,7 +298,7 @@ public class UserAspectRatioManagerTest {
when(mResources.getIntArray(anyInt())).thenReturn(new int[] {USER_MIN_ASPECT_RATIO_UNSET});
when(mResources.getStringArray(anyInt())).thenReturn(new String[] {newOptionName});
mUtils = new FakeUserAspectRatioManager(mContext, mIPm);
mUtils = new FakeUserAspectRatioManager(mContext, mIPm, mActivityTaskManager);
assertThat(getUserMinAspectRatioEntry(USER_MIN_ASPECT_RATIO_UNSET, mPackageName))
.isEqualTo(newOptionName);
@@ -305,7 +310,8 @@ public class UserAspectRatioManagerTest {
when(mResources.getIntArray(anyInt())).thenReturn(new int[] {USER_MIN_ASPECT_RATIO_4_3});
when(mResources.getStringArray(anyInt())).thenReturn(new String[] {"4:3"});
assertThrows(RuntimeException.class, () -> new FakeUserAspectRatioManager(mContext, mIPm));
assertThrows(RuntimeException.class, () -> new FakeUserAspectRatioManager(mContext, mIPm,
mActivityTaskManager));
}
@Test
@@ -315,7 +321,8 @@ public class UserAspectRatioManagerTest {
USER_MIN_ASPECT_RATIO_4_3});
when(mResources.getStringArray(anyInt())).thenReturn(new String[] {"4:3"});
assertThrows(RuntimeException.class, () -> new FakeUserAspectRatioManager(mContext, mIPm));
assertThrows(RuntimeException.class, () -> new FakeUserAspectRatioManager(mContext, mIPm,
mActivityTaskManager));
}
private void assertUnsetIsFullscreen() {
@@ -347,7 +354,8 @@ public class UserAspectRatioManagerTest {
}
@Test
public void testGetUserMinAspectRatioEntry_enabledFullscreenOverrideUniRes_returnsFullscreen() {
public void testGetUserMinAspectRatioEntry_enabledFullscreenOverrideUniRes_returnsFullscreen()
throws RemoteException {
setIsOverrideToFullscreenEnabledBecauseUniversalResizeable(true);
assertUnsetIsFullscreen();
}
@@ -359,7 +367,8 @@ public class UserAspectRatioManagerTest {
}
@Test
public void testGetUserMinAspectRatioEntry_noFullscreenUnivRes_returnsUnchanged() {
public void testGetUserMinAspectRatioEntry_noFullscreenUnivRes_returnsUnchanged()
throws RemoteException {
setIsOverrideToFullscreenEnabledBecauseUniversalResizeable(false);
assertUnsetIsAppDefault();
}
@@ -376,7 +385,7 @@ public class UserAspectRatioManagerTest {
@Test
public void testIsOverrideToFullscreenEnabledUnivRes_returnsTrue()
throws PackageManager.NameNotFoundException {
throws PackageManager.NameNotFoundException, RemoteException {
setIsOverrideToFullscreenEnabledBecauseUniversalResizeable(true);
assertTrue(mUtils.isOverrideToFullscreenEnabled(mPackageName, mContext.getUserId()));
@@ -412,8 +421,11 @@ public class UserAspectRatioManagerTest {
.thenReturn(enabled);
}
private void setIsOverrideToFullscreenEnabledBecauseUniversalResizeable(boolean enabled) {
mUtils.setUniversalResizeable(enabled);
private void setIsOverrideToFullscreenEnabledBecauseUniversalResizeable(boolean enabled)
throws RemoteException {
when(mIPm.getApplicationInfo(anyString(), anyLong(), anyInt())).thenReturn(
new ApplicationInfo());
when(mActivityTaskManager.canBeUniversalResizeable(any())).thenReturn(enabled);
when(mUtils.hasAspectRatioOption(USER_MIN_ASPECT_RATIO_FULLSCREEN, mPackageName))
.thenReturn(enabled);
}
@@ -476,10 +488,10 @@ 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);
private FakeUserAspectRatioManager(@NonNull Context context, IPackageManager pm,
ActivityTaskManager mMockActivityTaskManager) {
super(context, pm, mMockActivityTaskManager);
}
@Override
@@ -487,17 +499,8 @@ 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;
}
}
}