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

Remove PIN from users page - use disallow_add/remove_user restrictions.

Browse Source 
Bug: 14081992
Change-Id: If4973d64ae54da602a2682dee5b868ff66273856
This commit is contained in:
Julia Reynolds
2014-06-11 16:18:16 -04:00
parent c92af83b0c
commit b9195d25ee
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/users/UserPreference.java
View File

@@ -58,11 +58,13 @@ public class UserPreference extends Preference {
@Override @Override
protected void onBindView(View view) { protected void onBindView(View view) {
UserManager um = (UserManager) getContext().getSystemService(Context.USER_SERVICE);
View deleteDividerView = view.findViewById(R.id.divider_delete); View deleteDividerView = view.findViewById(R.id.divider_delete);
View manageDividerView = view.findViewById(R.id.divider_manage); View manageDividerView = view.findViewById(R.id.divider_manage);
View deleteView = view.findViewById(R.id.trash_user); View deleteView = view.findViewById(R.id.trash_user);
if (deleteView != null) { if (deleteView != null) {
if (mDeleteClickListener != null) { if (mDeleteClickListener != null
&& !um.hasUserRestriction(UserManager.DISALLOW_REMOVE_USER)) {
deleteView.setOnClickListener(mDeleteClickListener); deleteView.setOnClickListener(mDeleteClickListener);
deleteView.setTag(this); deleteView.setTag(this);
} else { } else {

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

@@ -64,12 +64,12 @@ import com.android.internal.widget.LockPatternUtils;
import com.android.settings.ChooseLockGeneric; import com.android.settings.ChooseLockGeneric;
import com.android.settings.OwnerInfoSettings; import com.android.settings.OwnerInfoSettings;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.RestrictedSettingsFragment;
import com.android.settings.SelectableEditTextPreference; import com.android.settings.SelectableEditTextPreference;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils; import com.android.settings.Utils;
public class UserSettings extends RestrictedSettingsFragment public class UserSettings extends SettingsPreferenceFragment
implements OnPreferenceClickListener, OnClickListener, DialogInterface.OnDismissListener, implements OnPreferenceClickListener, OnClickListener, DialogInterface.OnDismissListener,
Preference.OnPreferenceChangeListener { Preference.OnPreferenceChangeListener {
@@ -136,10 +136,6 @@ public class UserSettings extends RestrictedSettingsFragment
private SparseArray<Bitmap> mUserIcons = new SparseArray<Bitmap>(); private SparseArray<Bitmap> mUserIcons = new SparseArray<Bitmap>();
private boolean mIsOwner = UserHandle.myUserId() == UserHandle.USER_OWNER; private boolean mIsOwner = UserHandle.myUserId() == UserHandle.USER_OWNER;
public UserSettings() {
super(RestrictedSettingsFragment.RESTRICTIONS_PIN_SET);
}
private Handler mHandler = new Handler() { private Handler mHandler = new Handler() {
@Override @Override
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
@@ -204,7 +200,8 @@ public class UserSettings extends RestrictedSettingsFragment
} }
mAddUser = findPreference(KEY_ADD_USER); mAddUser = findPreference(KEY_ADD_USER);
if (!mIsOwner || UserManager.getMaxSupportedUsers() < 2 if (!mIsOwner || UserManager.getMaxSupportedUsers() < 2
|| !UserManager.supportsMultipleUsers()) { || !UserManager.supportsMultipleUsers()
|| mUserManager.hasUserRestriction(UserManager.DISALLOW_ADD_USER)) {
removePreference(KEY_ADD_USER); removePreference(KEY_ADD_USER);
} else { } else {
mAddUser.setOnPreferenceClickListener(this); mAddUser.setOnPreferenceClickListener(this);