diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 07cc59bf2ac..b40cfb28e85 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1665,16 +1665,6 @@ - - - - - - - - - - - - - - - - - diff --git a/res/values/strings.xml b/res/values/strings.xml index f2c00f3e762..945dd3d1395 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -702,10 +702,6 @@ Enable widgets Disabled by administrator - - NFC unlock - - @@ -5006,22 +5002,6 @@ - - NFC Screen Lock Settings - Paired Tags - Enabled - Pair with a tag - - - NfcPairingActivity - Pair now - Set the tag flat on a table and place the phone on top - Tag and phone successfully paired, you are done! - The tag provided cannot be used to unlock your phone - The pairing with your tag failed, please try again - NFC is not enabled and is required for NFC Unlock. Please turn on NFC. - NFC Settings - Settings diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml index 7226c6cc8b0..c663492d4e2 100644 --- a/res/xml/security_settings_biometric_weak.xml +++ b/res/xml/security_settings_biometric_weak.xml @@ -57,11 +57,6 @@ android:title="@string/owner_info_settings_title" android:summary="@string/owner_info_settings_summary"/> - - diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml index f6e2e89ddae..d17366ef3d1 100644 --- a/res/xml/security_settings_chooser.xml +++ b/res/xml/security_settings_chooser.xml @@ -32,11 +32,6 @@ android:title="@string/owner_info_settings_title" android:summary="@string/owner_info_settings_summary"/> - - diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml index 03807169a09..b418aa7d59c 100644 --- a/res/xml/security_settings_password.xml +++ b/res/xml/security_settings_password.xml @@ -44,11 +44,6 @@ android:title="@string/owner_info_settings_title" android:summary="@string/owner_info_settings_summary"/> - - diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml index 8a8cb63cbd9..d47a99d0427 100644 --- a/res/xml/security_settings_pattern.xml +++ b/res/xml/security_settings_pattern.xml @@ -48,11 +48,6 @@ android:title="@string/owner_info_settings_title" android:summary="@string/owner_info_settings_summary"/> - - diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml index c11463158ee..c1aac484ce7 100644 --- a/res/xml/security_settings_pin.xml +++ b/res/xml/security_settings_pin.xml @@ -44,11 +44,6 @@ android:title="@string/owner_info_settings_title" android:summary="@string/owner_info_settings_summary"/> - - diff --git a/src/com/android/settings/NfcLockFragment.java b/src/com/android/settings/NfcLockFragment.java deleted file mode 100644 index b7bf6f768c6..00000000000 --- a/src/com/android/settings/NfcLockFragment.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings; - -import android.app.AlertDialog; -import android.content.DialogInterface; -import android.nfc.NfcAdapter; -import android.nfc.NfcUnlock; -import android.os.Bundle; -import android.preference.CheckBoxPreference; -import android.preference.Preference; - -import android.preference.PreferenceCategory; -import android.util.Log; -import com.android.internal.widget.LockPatternUtils; - -import java.text.DateFormat; -import java.util.Date; - -import static android.preference.Preference.OnPreferenceClickListener; - -public class NfcLockFragment extends SettingsPreferenceFragment { - - private static final String NFC_PAIRING = "nfc_pairing"; - private static final String NFC_UNLOCK_ENABLED = "nfc_unlock_enabled"; - private static final String TAGS_CATEGORY = "nfc_unlock_tags_category"; - private static final String TAG_FORMAT = "Tag # %d"; - - private NfcUnlock mNfcUnlock; - private LockPatternUtils mLockPatternUtils; - private NfcAdapter mNfcAdapter; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - mNfcUnlock = NfcUnlock.getInstance(NfcAdapter.getDefaultAdapter(getActivity())); - mLockPatternUtils = new LockPatternUtils(getActivity()); - mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity()); - addPreferencesFromResource(R.xml.security_settings_nfc_unlock); - } - - @Override - public void onResume() { - super.onResume(); - - boolean prefsEnabled = (mLockPatternUtils.isLockPasswordEnabled() || - mLockPatternUtils.isLockPatternEnabled()) && mNfcAdapter.isEnabled(); - CheckBoxPreference unlockPref = (CheckBoxPreference) findPreference(NFC_UNLOCK_ENABLED); - unlockPref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - mNfcUnlock.setNfcUnlockEnabled((Boolean) newValue); - return true; - } - }); - Preference pairingPref = findPreference(NFC_PAIRING); - unlockPref.setEnabled(prefsEnabled); - pairingPref.setEnabled(prefsEnabled); - - long[] tagRegistryTimes = mNfcUnlock.getTagRegistryTimes(); - unlockPref.setChecked(mNfcUnlock.getNfcUnlockEnabled()); - - final PreferenceCategory pairedTags = (PreferenceCategory) findPreference(TAGS_CATEGORY); - pairedTags.setEnabled(prefsEnabled); - - loadTagList(tagRegistryTimes, pairedTags); - } - - private void loadTagList(long[] tagRegistryTimes, final PreferenceCategory pairedTags) { - pairedTags.removeAll(); - - for (int i = 0; i < tagRegistryTimes.length; i++) { - - final Preference thisPreference = new Preference(getActivity()); - final long timestamp = tagRegistryTimes[i]; - - thisPreference.setTitle(String.format(TAG_FORMAT, i)); - thisPreference.setSummary( - DateFormat.getDateTimeInstance().format(new Date(tagRegistryTimes[i]))); - thisPreference.setOnPreferenceClickListener(new OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - - AlertDialog.Builder deleteDialogBuilder = new AlertDialog.Builder(getActivity()); - - deleteDialogBuilder.setTitle(thisPreference.getTitle()); - deleteDialogBuilder.setItems(new String[] {"Delete"}, - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - if (which == 0) { - if (mNfcUnlock.deregisterTag(timestamp)) { - loadTagList(mNfcUnlock.getTagRegistryTimes(), - pairedTags); - } - } - } - }); - - - deleteDialogBuilder.show(); - - return true; - } - }); - - - pairedTags.addPreference(thisPreference); - } - } -} diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 0ab9ea729ab..00d1d89d3d3 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -20,7 +20,6 @@ package com.android.settings; import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT; import android.app.Activity; -import android.app.ActivityManager; import android.app.AlertDialog; import android.app.admin.DevicePolicyManager; import android.content.Context; @@ -30,7 +29,6 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.pm.UserInfo; import android.content.res.Resources; -import android.nfc.NfcUnlock; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; @@ -54,8 +52,6 @@ import com.android.settings.search.SearchIndexableRaw; import java.util.ArrayList; import java.util.List; -import static com.android.settings.search.SearchIndexableResources.RANK_SECURITY; - /** * Gesture lock pattern settings. */ @@ -65,7 +61,6 @@ public class SecuritySettings extends RestrictedSettingsFragment // Lock Settings private static final String KEY_UNLOCK_SET_OR_CHANGE = "unlock_set_or_change"; - private static final String KEY_NFC_UNLOCK_SET_OR_CHANGE = "nfc_unlock_set_or_change"; private static final String KEY_BIOMETRIC_WEAK_IMPROVE_MATCHING = "biometric_weak_improve_matching"; private static final String KEY_BIOMETRIC_WEAK_LIVELINESS = "biometric_weak_liveliness"; @@ -238,19 +233,6 @@ public class SecuritySettings extends RestrictedSettingsFragment } } - // don't display NFC unlock settings if the prop is not enabled - if (!NfcUnlock.getPropertyEnabled()) { - PreferenceGroup securityCategory = - (PreferenceGroup) root.findPreference(KEY_SECURITY_CATEGORY); - - if (securityCategory != null) { - Preference preference = root.findPreference(KEY_NFC_UNLOCK_SET_OR_CHANGE); - if (preference != null) { - securityCategory.removePreference(preference); - } - } - } - // Append the rest of the settings addPreferencesFromResource(R.xml.security_settings_misc); @@ -490,9 +472,6 @@ public class SecuritySettings extends RestrictedSettingsFragment if (KEY_UNLOCK_SET_OR_CHANGE.equals(key)) { startFragment(this, "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment", SET_OR_CHANGE_LOCK_METHOD_REQUEST, null); - } else if (KEY_NFC_UNLOCK_SET_OR_CHANGE.equals(key)) { - startFragment(this, "com.android.settings.NfcLockFragment", - SET_OR_CHANGE_LOCK_METHOD_REQUEST, null); } else if (KEY_BIOMETRIC_WEAK_IMPROVE_MATCHING.equals(key)) { ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this.getActivity(), this);