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

Fix references to resources for Settings

Browse Source 
Bug: 293810334
Test: m Settings
Change-Id: Ie140278f492ef7e1c062ec1ecae2866c521a86aa
This commit is contained in:
Chaohui Wang
2023-07-31 15:56:42 +08:00
parent ed505c25fa
commit 2541381259
247 changed files with 859 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1004,9 +1004,9 @@ public class UserSettings extends SettingsPreferenceFragment
mAddingUser = true;
mAddingUserName = userType == USER_TYPE_USER
? (mPendingUserName != null ? mPendingUserName.toString()
: getString(R.string.user_new_user_name))
: getString(com.android.settingslib.R.string.user_new_user_name))
: (mPendingUserName != null ? mPendingUserName.toString()
: getString(R.string.user_new_profile_name));
: getString(com.android.settingslib.R.string.user_new_profile_name));
}
mUserCreatingDialog = new UserCreatingDialog(getActivity());
@@ -1357,13 +1357,14 @@ public class UserSettings extends SettingsPreferenceFragment
String guestExitSummary;
if (mUserCaps.mIsEphemeral) {
guestExitSummary = getContext().getString(
R.string.guest_notification_ephemeral);
com.android.settingslib.R.string.guest_notification_ephemeral);
} else if (isGuestFirstLogin) {
guestExitSummary = getContext().getString(
R.string.guest_notification_non_ephemeral);
com.android.settingslib.R.string.guest_notification_non_ephemeral);
} else {
guestExitSummary = getContext().getString(
R.string.guest_notification_non_ephemeral_non_first_login);
com.android.settingslib.R
.string.guest_notification_non_ephemeral_non_first_login);
}
mGuestExitPreference.setSummary(guestExitSummary);
}
@@ -1394,7 +1395,8 @@ public class UserSettings extends SettingsPreferenceFragment
pref.setOnPreferenceClickListener(this);
pref.setEnabled(canOpenUserDetails);
pref.setSelectable(true);
Drawable icon = getContext().getDrawable(R.drawable.ic_account_circle_outline);
Drawable icon = getContext().getDrawable(
com.android.settingslib.R.drawable.ic_account_circle_outline);
icon.setTint(
getColorAttrDefaultColor(getContext(), android.R.attr.colorControlNormal));
pref.setIcon(encircleUserIcon(
@@ -1439,14 +1441,15 @@ 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);
Drawable icon = context.getDrawable(
com.android.settingslib.R.drawable.ic_account_circle);
mAddGuest.setIcon(centerAndTint(icon));
isVisible = true;
mAddGuest.setVisible(true);
mAddGuest.setSelectable(true);
if (mGuestUserAutoCreated && mGuestCreationScheduled.get()) {
mAddGuest.setTitle(com.android.internal.R.string.guest_name);
mAddGuest.setSummary(R.string.guest_resetting);
mAddGuest.setSummary(com.android.settingslib.R.string.guest_resetting);
mAddGuest.setEnabled(false);
} else {
mAddGuest.setTitle(com.android.settingslib.R.string.guest_new_guest);
@@ -1460,14 +1463,16 @@ 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);
Drawable icon = context.getDrawable(
com.android.settingslib.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);
Drawable icon = context.getDrawable(
com.android.settingslib.R.drawable.ic_add_supervised_user);
mAddSupervisedUser.setIcon(centerAndTint(icon));
} else {
mAddSupervisedUser.setVisible(false);
@@ -1505,7 +1510,8 @@ public class UserSettings extends SettingsPreferenceFragment
icon.setTintBlendMode(BlendMode.SRC_IN);
icon.setTint(getColorAttrDefaultColor(getContext(), android.R.attr.textColorPrimary));
Drawable bg = getContext().getDrawable(R.drawable.user_avatar_bg).mutate();
Drawable bg = getContext().getDrawable(com.android.settingslib.R.drawable.user_avatar_bg)
.mutate();
LayerDrawable ld = new LayerDrawable(new Drawable[] {bg, icon});
int size = getContext().getResources().getDimensionPixelSize(
R.dimen.multiple_users_avatar_size);