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

Merge "UserDetailsSettings uses Guest string, not Guest name" into sc-dev

Browse Source
This commit is contained in:
Adam Bookatz
2021-04-27 16:35:37 +00:00
committed by Android (Google) Code Review
parent 7fe923eec3 f493bf0cdb
commit e035a81ddc
2 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/users/UserDetailsSettings.java
View File

@@ -206,7 +206,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
mSwitchUserPref.setTitle( mSwitchUserPref.setTitle(
context.getString(com.android.settingslib.R.string.user_switch_to_user, context.getString(com.android.settingslib.R.string.user_switch_to_user,
mUserInfo.name)); UserSettings.getUserName(context, mUserInfo)));
if (mUserCaps.mDisallowSwitchUser) { if (mUserCaps.mDisallowSwitchUser) {
mSwitchUserPref.setDisabledByAdmin(RestrictedLockUtilsInternal.getDeviceOwner(context)); mSwitchUserPref.setDisabledByAdmin(RestrictedLockUtilsInternal.getDeviceOwner(context));

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

@@ -16,6 +16,7 @@
package com.android.settings.users; package com.android.settings.users;
import android.annotation.NonNull;
import android.app.Activity; import android.app.Activity;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.Dialog; import android.app.Dialog;
@@ -505,10 +506,12 @@ public class UserSettings extends SettingsPreferenceFragment
Bundle extras = new Bundle(); Bundle extras = new Bundle();
extras.putInt(UserDetailsSettings.EXTRA_USER_ID, userInfo.id); extras.putInt(UserDetailsSettings.EXTRA_USER_ID, userInfo.id);
extras.putBoolean(AppRestrictionsFragment.EXTRA_NEW_USER, newUser); extras.putBoolean(AppRestrictionsFragment.EXTRA_NEW_USER, newUser);
new SubSettingLauncher(getContext())
final Context context = getContext();
new SubSettingLauncher(context)
.setDestination(UserDetailsSettings.class.getName()) .setDestination(UserDetailsSettings.class.getName())
.setArguments(extras) .setArguments(extras)
.setTitleText(userInfo.name) .setTitleText(getUserName(context, userInfo))
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.launch(); .launch();
} }
@@ -859,32 +862,30 @@ public class UserSettings extends SettingsPreferenceFragment
UserPreference pref; UserPreference pref;
if (user.id == UserHandle.myUserId()) { if (user.id == UserHandle.myUserId()) {
pref = mMePreference; pref = mMePreference;
} else if (user.isGuest()) { } else {
pref = new UserPreference(getPrefContext(), null, user.id); final Context prefContext = getPrefContext();
pref.setTitle(R.string.user_guest); pref = new UserPreference(prefContext, null, user.id);
pref.setIcon(getEncircledDefaultIcon()); pref.setTitle(getUserName(prefContext, user));
pref.setKey(KEY_USER_GUEST);
userPreferences.add(pref); userPreferences.add(pref);
pref.setOnPreferenceClickListener(this);
pref.setEnabled(canOpenUserDetails); pref.setEnabled(canOpenUserDetails);
pref.setSelectable(true); pref.setSelectable(true);
if (user.isGuest()) {
pref.setIcon(getEncircledDefaultIcon());
pref.setKey(KEY_USER_GUEST);
if (mUserCaps.mDisallowSwitchUser) { if (mUserCaps.mDisallowSwitchUser) {
pref.setDisabledByAdmin(RestrictedLockUtilsInternal.getDeviceOwner(context)); pref.setDisabledByAdmin(
RestrictedLockUtilsInternal.getDeviceOwner(context));
} else { } else {
pref.setDisabledByAdmin(null); pref.setDisabledByAdmin(null);
} }
pref.setOnPreferenceClickListener(this);
} else { } else {
pref = new UserPreference(getPrefContext(), null, user.id);
pref.setKey("id=" + user.id); pref.setKey("id=" + user.id);
userPreferences.add(pref);
if (user.isAdmin()) { if (user.isAdmin()) {
pref.setSummary(R.string.user_admin); pref.setSummary(R.string.user_admin);
} }
pref.setTitle(user.name); }
pref.setOnPreferenceClickListener(this);
pref.setEnabled(canOpenUserDetails);
pref.setSelectable(true);
} }
if (pref == null) { if (pref == null) {
continue; continue;
@@ -1063,6 +1064,14 @@ public class UserSettings extends SettingsPreferenceFragment
} }
} }
/** Returns the user's name, or the appropriate string in the case of a Guest. */
public static String getUserName(Context context, @NonNull UserInfo userInfo) {
if (userInfo.isGuest()) {
return context.getString(R.string.user_guest);
}
return userInfo.name;
}
@Override @Override
public boolean onPreferenceClick(Preference pref) { public boolean onPreferenceClick(Preference pref) {
if (pref == mMePreference) { if (pref == mMePreference) {