Add padlocks to preferences that can be disabled by policy.
Change-Id: I43b6b5954ef6ec65b86d99321cabab9f49df842d
This commit is contained in:
@@ -27,6 +27,7 @@ import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settingslib.RestrictedPreference;
|
||||
|
||||
/**
|
||||
* NfcEnabler is a helper to manage the Nfc on/off checkbox preference. It is
|
||||
@@ -36,10 +37,9 @@ import com.android.settings.R;
|
||||
public class NfcEnabler implements Preference.OnPreferenceChangeListener {
|
||||
private final Context mContext;
|
||||
private final SwitchPreference mSwitch;
|
||||
private final PreferenceScreen mAndroidBeam;
|
||||
private final RestrictedPreference mAndroidBeam;
|
||||
private final NfcAdapter mNfcAdapter;
|
||||
private final IntentFilter mIntentFilter;
|
||||
private boolean mBeamDisallowed;
|
||||
|
||||
private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
|
||||
@Override
|
||||
@@ -53,13 +53,11 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
|
||||
};
|
||||
|
||||
public NfcEnabler(Context context, SwitchPreference switchPreference,
|
||||
PreferenceScreen androidBeam) {
|
||||
RestrictedPreference androidBeam) {
|
||||
mContext = context;
|
||||
mSwitch = switchPreference;
|
||||
mAndroidBeam = androidBeam;
|
||||
mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
|
||||
mBeamDisallowed = ((UserManager) mContext.getSystemService(Context.USER_SERVICE))
|
||||
.hasUserRestriction(UserManager.DISALLOW_OUTGOING_BEAM);
|
||||
|
||||
if (mNfcAdapter == null) {
|
||||
// NFC is not supported
|
||||
@@ -68,9 +66,6 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
|
||||
mIntentFilter = null;
|
||||
return;
|
||||
}
|
||||
if (mBeamDisallowed) {
|
||||
mAndroidBeam.setEnabled(false);
|
||||
}
|
||||
mIntentFilter = new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
|
||||
}
|
||||
|
||||
@@ -117,8 +112,8 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
|
||||
case NfcAdapter.STATE_ON:
|
||||
mSwitch.setChecked(true);
|
||||
mSwitch.setEnabled(true);
|
||||
mAndroidBeam.setEnabled(!mBeamDisallowed);
|
||||
if (mNfcAdapter.isNdefPushEnabled() && !mBeamDisallowed) {
|
||||
mAndroidBeam.checkRestrictionAndSetDisabled(UserManager.DISALLOW_OUTGOING_BEAM);
|
||||
if (mNfcAdapter.isNdefPushEnabled() && mAndroidBeam.isEnabled()) {
|
||||
mAndroidBeam.setSummary(R.string.android_beam_on_summary);
|
||||
} else {
|
||||
mAndroidBeam.setSummary(R.string.android_beam_off_summary);
|
||||
|
Reference in New Issue
Block a user