Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Changed the managed profile switching icon"

Browse Source
This commit is contained in:
Kholoud Mohamed
2022-01-31 19:45:49 +00:00
committed by Android (Google) Code Review
parent d87bacafda 6c9333974d
commit e3fbc9417f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/pm/CrossProfileApps.java
View File

@@ -282,7 +282,8 @@ public class CrossProfileApps {
final boolean isManagedProfile =
mUserManager.isManagedProfile(userHandle.getIdentifier());
if (isManagedProfile) {
return mResources.getDrawable(R.drawable.ic_corp_badge, null);
return mContext.getPackageManager().getUserBadgeForDensityNoBackground(
userHandle, /* density= */ 0);
} else {
return UserIcons.getDefaultUserIcon(
mResources, UserHandle.USER_SYSTEM, true /* light */);

6
core/tests/coretests/src/android/content/pm/CrossProfileAppsTest.java
View File

@@ -71,6 +71,8 @@ public class CrossProfileAppsTest {
private Resources mResources;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Drawable mDrawable;
@Mock
private PackageManager mPackageManager;
private CrossProfileApps mCrossProfileApps;
@Before
@@ -87,6 +89,7 @@ public class CrossProfileAppsTest {
Context.DEVICE_POLICY_SERVICE);
when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(
mDevicePolicyManager);
when(mContext.getPackageManager()).thenReturn(mPackageManager);
}
@Before
@@ -131,7 +134,8 @@ public class CrossProfileAppsTest {
setValidTargetProfile(MANAGED_PROFILE);
mCrossProfileApps.getProfileSwitchingIconDrawable(MANAGED_PROFILE);
verify(mResources).getDrawable(R.drawable.ic_corp_badge, null);
verify(mPackageManager).getUserBadgeForDensityNoBackground(
MANAGED_PROFILE, /* density= */0);
}
@Test