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

Part3 - Don't add padlock if the restriction is not set by admin.

Browse Source 
Bug: 26687435
Change-Id: Ibfea6d7d5bd32e7a05dcc2cc32b121c9e50b6a34
This commit is contained in:
Sudheer Shanka
2016-02-11 18:48:14 +00:00
parent 7f2a013619
commit 9e9e63b7b3
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) {