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

Merge "Update icons in multiuser settings" into tm-qpr-dev am: a666d80973 am: 8b7a6d5349

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745315

Change-Id: Ic435088eeef5d07507868925b869550760364386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tetiana Meronyk
2022-09-01 20:44:50 +00:00
committed by Automerger Merge Worker
parent b46e4b0755 8b7a6d5349
commit bfb90d17dc
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/users/UserSettings.java
View File

@@ -1449,6 +1449,8 @@ public class UserSettings extends SettingsPreferenceFragment
&& mUserManager.canAddMoreUsers(UserManager.USER_TYPE_FULL_GUEST)
&& WizardManagerHelper.isDeviceProvisioned(context)
&& mUserCaps.mUserSwitcherEnabled) {
Drawable icon = context.getDrawable(R.drawable.ic_account_circle);
mAddGuest.setIcon(centerAndTint(icon));
isVisible = true;
mAddGuest.setVisible(true);
mAddGuest.setSelectable(true);
@@ -1468,11 +1470,15 @@ public class UserSettings extends SettingsPreferenceFragment
private void updateAddUser(Context context) {
updateAddUserCommon(context, mAddUser, mUserCaps.mCanAddRestrictedProfile);
Drawable icon = context.getDrawable(R.drawable.ic_account_circle_filled);
mAddUser.setIcon(centerAndTint(icon));
}
private void updateAddSupervisedUser(Context context) {
if (!TextUtils.isEmpty(mConfigSupervisedUserCreationPackage)) {
updateAddUserCommon(context, mAddSupervisedUser, false);
Drawable icon = context.getDrawable(R.drawable.ic_add_supervised_user);
mAddSupervisedUser.setIcon(centerAndTint(icon));
} else {
mAddSupervisedUser.setVisible(false);
}
@@ -1513,7 +1519,10 @@ public class UserSettings extends SettingsPreferenceFragment
LayerDrawable ld = new LayerDrawable(new Drawable[] {bg, icon});
int size = getContext().getResources().getDimensionPixelSize(
R.dimen.multiple_users_avatar_size);
int bgSize = getContext().getResources().getDimensionPixelSize(
R.dimen.multiple_users_user_icon_size);
ld.setLayerSize(1, size, size);
ld.setLayerSize(0, bgSize, bgSize);
ld.setLayerGravity(1, Gravity.CENTER);
return ld;