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

Remove switching from Users menu

Browse Source 
Bug: 26562786
Change-Id: Id0f26621b8356c3161dee861b0215b01d48007c9
This commit is contained in:
Fyodor Kupolov
2016-01-29 17:29:54 -08:00
parent 4d2e77899f
commit 889bc3de82
1 changed files with 7 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -775,16 +775,14 @@ public class UserSettings extends SettingsPreferenceFragment
userPreferences.add(pref); userPreferences.add(pref);
} }
if (!mUserCaps.mIsGuest && // Check if Guest tile should be added.
(mUserCaps.mCanAddGuest || findGuest() != null || mUserCaps.mDisallowAddUser)) { if (!mUserCaps.mIsGuest && (mUserCaps.mCanAddGuest || mUserCaps.mDisallowAddUser)) {
// Add a virtual Guest user for guest defaults
UserPreference pref = new UserPreference(getPrefContext(), null, UserPreference pref = new UserPreference(getPrefContext(), null,
UserPreference.USERID_GUEST_DEFAULTS, UserPreference.USERID_GUEST_DEFAULTS,
mUserCaps.mIsAdmin && voiceCapable? this : null /* settings icon handler */, mUserCaps.mIsAdmin && voiceCapable? this : null /* settings icon handler */,
null /* delete icon handler */); null /* delete icon handler */);
pref.setTitle(R.string.user_guest); pref.setTitle(R.string.user_guest);
pref.setIcon(getEncircledDefaultIcon()); pref.setIcon(getEncircledDefaultIcon());
pref.setOnPreferenceClickListener(this);
userPreferences.add(pref); userPreferences.add(pref);
pref.setDisabledByAdmin( pref.setDisabledByAdmin(
mUserCaps.mDisallowAddUser ? mUserCaps.mEnforcedAdmin : null); mUserCaps.mDisallowAddUser ? mUserCaps.mEnforcedAdmin : null);
@@ -922,17 +920,11 @@ public class UserSettings extends SettingsPreferenceFragment
} }
} else if (pref instanceof UserPreference) { } else if (pref instanceof UserPreference) {
int userId = ((UserPreference) pref).getUserId(); int userId = ((UserPreference) pref).getUserId();
if (userId == UserPreference.USERID_GUEST_DEFAULTS) {
createAndSwitchToGuestUser();
} else {
// Get the latest status of the user // Get the latest status of the user
UserInfo user = mUserManager.getUserInfo(userId); UserInfo user = mUserManager.getUserInfo(userId);
if (!isInitialized(user)) { if (!isInitialized(user)) {
mHandler.sendMessage(mHandler.obtainMessage( mHandler.sendMessage(mHandler.obtainMessage(
MESSAGE_SETUP_USER, user.id, user.serialNumber)); MESSAGE_SETUP_USER, user.id, user.serialNumber));
} else {
switchUserNow(userId);
}
} }
} else if (pref == mAddUser) { } else if (pref == mAddUser) {
// If we allow both types, show a picker, otherwise directly go to // If we allow both types, show a picker, otherwise directly go to
@@ -949,29 +941,6 @@ public class UserSettings extends SettingsPreferenceFragment
return false; return false;
} }
private void createAndSwitchToGuestUser() {
final UserInfo guest = findGuest();
if (guest != null) {
switchUserNow(guest.id);
return;
}
UserInfo guestUser = mUserManager.createGuest(getActivity(),
getResources().getString(R.string.user_guest));
if (guestUser != null) {
switchUserNow(guestUser.id);
}
}
private UserInfo findGuest() {
List<UserInfo> users = mUserManager.getUsers();
for (UserInfo user : users) {
if (user.isGuest()) {
return user;
}
}
return null;
}
private boolean isInitialized(UserInfo user) { private boolean isInitialized(UserInfo user) {
return (user.flags & UserInfo.FLAG_INITIALIZED) != 0; return (user.flags & UserInfo.FLAG_INITIALIZED) != 0;
} }