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

Merge "Part3 - Don't add padlock if the restriction is not set by admin." into nyc-dev

Browse Source
This commit is contained in:
Sudheer Shanka
2016-02-19 19:31:44 +00:00
committed by Android (Google) Code Review
parent 1b59691855 9e9e63b7b3
commit 5d8e963c83
21 changed files with 207 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ import android.support.v7.preference.Preference;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.RestrictedLockUtils;
import java.util.List;
@@ -60,7 +60,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
private UserManager mUserManager;
private SwitchPreference mPhonePref;
private RestrictedPreference mRemoveUserPref;
private Preference mRemoveUserPref;
private UserInfo mUserInfo;
private boolean mGuestUser;
@@ -80,7 +80,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
addPreferencesFromResource(R.xml.user_details_settings);
mPhonePref = (SwitchPreference) findPreference(KEY_ENABLE_TELEPHONY);
mRemoveUserPref = (RestrictedPreference) findPreference(KEY_REMOVE_USER);
mRemoveUserPref = findPreference(KEY_REMOVE_USER);
mGuestUser = getArguments().getBoolean(EXTRA_USER_GUEST, false);
@@ -103,15 +103,13 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
mPhonePref.setChecked(
!mDefaultGuestRestrictions.getBoolean(UserManager.DISALLOW_OUTGOING_CALLS));
}
if (RestrictedLockUtils.hasBaseUserRestriction(context,
UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId())) {
removePreference(KEY_REMOVE_USER);
}
mPhonePref.setOnPreferenceChangeListener(this);
}
@Override
public void onResume() {
super.onResume();
mRemoveUserPref.checkRestrictionAndSetDisabled(UserManager.DISALLOW_REMOVE_USER);
}
@Override
public boolean onPreferenceClick(Preference preference) {
if (preference == mRemoveUserPref) {