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

am 06c86162: am 26523d28: am f1d56ebb: Merge "Follow split of DISALLOW_TELEPHONY" into lmp-dev

Browse Source 
* commit '06c861629162e097cb4c6f116161cf326261c8e4':
  Follow split of DISALLOW_TELEPHONY
This commit is contained in:
Amith Yamasani
2014-07-17 21:04:16 +00:00
committed by Android Git Automerger
parent 0847de429a 06c8616291
commit ae2e8795eb
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,8 +83,8 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
throw new RuntimeException("Arguments to this fragment must contain the user id"); throw new RuntimeException("Arguments to this fragment must contain the user id");
} }
mUserInfo = mUserManager.getUserInfo(userId); mUserInfo = mUserManager.getUserInfo(userId);
mPhonePref.setChecked(!mUserManager.hasUserRestriction(UserManager.DISALLOW_TELEPHONY, mPhonePref.setChecked(!mUserManager.hasUserRestriction(
new UserHandle(userId))); UserManager.DISALLOW_OUTGOING_CALLS, new UserHandle(userId)));
mRemoveUserPref.setOnPreferenceClickListener(this); mRemoveUserPref.setOnPreferenceClickListener(this);
} else { } else {
// These are not for an existing user, just general Guest settings. // These are not for an existing user, just general Guest settings.
@@ -93,7 +93,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
mPhonePref.setTitle(R.string.user_enable_calling); mPhonePref.setTitle(R.string.user_enable_calling);
mDefaultGuestRestrictions = mUserManager.getDefaultGuestRestrictions(); mDefaultGuestRestrictions = mUserManager.getDefaultGuestRestrictions();
mPhonePref.setChecked( mPhonePref.setChecked(
!mDefaultGuestRestrictions.getBoolean(UserManager.DISALLOW_TELEPHONY)); !mDefaultGuestRestrictions.getBoolean(UserManager.DISALLOW_OUTGOING_CALLS));
} }
mPhonePref.setOnPreferenceChangeListener(this); mPhonePref.setOnPreferenceChangeListener(this);
} }
@@ -114,13 +114,18 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
if (mGuestUser) { if (mGuestUser) {
// TODO: Show confirmation dialog: b/15761405 // TODO: Show confirmation dialog: b/15761405
mDefaultGuestRestrictions.putBoolean(UserManager.DISALLOW_TELEPHONY, mDefaultGuestRestrictions.putBoolean(UserManager.DISALLOW_OUTGOING_CALLS,
!((Boolean) newValue)); !((Boolean) newValue));
// SMS is always disabled for guest
mDefaultGuestRestrictions.putBoolean(UserManager.DISALLOW_SMS, true);
mUserManager.setDefaultGuestRestrictions(mDefaultGuestRestrictions); mUserManager.setDefaultGuestRestrictions(mDefaultGuestRestrictions);
} else { } else {
// TODO: Show confirmation dialog: b/15761405 // TODO: Show confirmation dialog: b/15761405
mUserManager.setUserRestriction(UserManager.DISALLOW_TELEPHONY, !((Boolean) newValue), UserHandle userHandle = new UserHandle(mUserInfo.id);
new UserHandle(mUserInfo.id)); mUserManager.setUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS,
!((Boolean) newValue), userHandle);
mUserManager.setUserRestriction(UserManager.DISALLOW_SMS,
!((Boolean) newValue), userHandle);
} }
return true; return true;
} }