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

Update icons and text for guest user

Browse Source 
Test: As Guest, open Settings > System > Multiple users
Test: As Owner, open Settings > System > Multiple users
Bug: 169783558
Change-Id: I42c0b46fd895267b7556f3f308957b6dd17d92c4
This commit is contained in:
Peter Kalauskas
2020-12-30 17:43:14 -08:00
parent b6a5141953
commit 0fa7edbb02
4 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ import android.content.pm.UserInfo;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.AsyncTask;
@@ -164,6 +165,7 @@ public class UserSettings extends SettingsPreferenceFragment
private final Object mUserLock = new Object();
private UserManager mUserManager;
private static SparseArray<Bitmap> sDarkDefaultUserBitmapCache = new SparseArray<>();
private static Bitmap sRemoveGuestBitmap = null;
private MultiUserSwitchBarController mSwitchBarController;
private EditUserInfoController mEditUserInfoController =
@@ -177,6 +179,7 @@ public class UserSettings extends SettingsPreferenceFragment
// A place to cache the generated default avatar
private Drawable mDefaultIconDrawable;
private Drawable mRemoveGuestIconDrawable;
// TODO: Replace current Handler solution to something that doesn't leak memory and works
// TODO: during a configuration change
@@ -383,8 +386,8 @@ public class UserSettings extends SettingsPreferenceFragment
private void loadProfile() {
if (isCurrentUserGuest()) {
// No need to load profile information
mMePreference.setIcon(getEncircledDefaultIcon());
mMePreference.setTitle(R.string.user_exit_guest_title);
mMePreference.setIcon(getEncircledRemoveGuestIcon());
mMePreference.setTitle(R.string.user_clear_guest_menu);
mMePreference.setSelectable(true);
// removing a guest will result in switching back to the admin user
mMePreference.setEnabled(canSwitchUserNow());
@@ -899,7 +902,7 @@ public class UserSettings extends SettingsPreferenceFragment
} else {
setPhotoId(pref, user);
}
} else {
} else if (!user.isGuest()) {
// Icon not available yet, print a placeholder
pref.setIcon(getEncircledDefaultIcon());
}
@@ -1044,6 +1047,14 @@ public class UserSettings extends SettingsPreferenceFragment
return mDefaultIconDrawable;
}
private Drawable getEncircledRemoveGuestIcon() {
if (mRemoveGuestIconDrawable == null) {
mRemoveGuestIconDrawable = encircle(
getRemoveGuestIconAsBitmap(getContext().getResources()));
}
return mRemoveGuestIconDrawable;
}
private void setPhotoId(Preference pref, UserInfo user) {
Bitmap bitmap = mUserIcons.get(user.id);
if (bitmap != null) {
@@ -1122,6 +1133,23 @@ public class UserSettings extends SettingsPreferenceFragment
return bitmap;
}
/**
* Returns a remove guest icon (as a {@link Bitmap})
*
* @param resources resources object to fetch the remove guest icon.
*/
private static Bitmap getRemoveGuestIconAsBitmap(Resources resources) {
if (sRemoveGuestBitmap == null) {
Drawable icon = resources.getDrawable(R.drawable.ic_delete, null).mutate();
icon.setColorFilter(
resources.getColor(com.android.internal.R.color.user_icon_default_gray, null),
PorterDuff.Mode.SRC_IN);
icon.setBounds(0, 0, icon.getIntrinsicWidth(), icon.getIntrinsicHeight());
sRemoveGuestBitmap = UserIcons.convertToBitmap(icon);
}
return sRemoveGuestBitmap;
}
/**
* Assign the default photo to user with {@paramref userId}
*