Revert "Settings for NFC Unlock"

This will be rolled into a Trustlet

This reverts commit fd2b629335.

Change-Id: I921f0838d4646799b6664da64a578a209e9c037e

AndroidManifest.xml

@@ -1665,16 +1665,6 @@
             </intent-filter>
         </activity>
 
-       <activity android:name=".PairNfcDevice"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$SecuritySettingsActivity"
-                android:launchMode="singleTask">
-            <intent-filter>
-                <action android:name="android.settings.PAIR_NFC_DEVICE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
         <activity android:name="Settings$NotificationAccessSettingsActivity"
                   android:label="@string/manage_notification_access"
                   android:taskAffinity=""

res/layout/activity_nfc_pairing.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_vertical">
-
-     <ImageView
-        android:id="@+id/status_image"
-        android:src="@drawable/no_ring_detected"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="bottom"
-        android:scaleType="center"/>
-
-     <TextView
-        android:id="@+id/status_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="top"
-        android:textSize="24sp"
-        android:textAlignment="center"
-        android:paddingTop="16dp"
-        android:paddingLeft="20dp"
-        android:paddingRight="20dp"/>
-
-</LinearLayout>

res/values/strings.xml

@@ -702,10 +702,6 @@
     <string name="security_enable_widgets_title">Enable widgets</string>
     <!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->
     <string name="security_enable_widgets_disabled_summary">Disabled by administrator</string>
-    <!-- Text shown for title of settings to setup/change NFC unlock [CHAR LIMIT=20]-->
-    <string name="nfc_unlock_title">NFC unlock</string>
-
-
     <!-- Text shown for summary of owner info setting [CHAR LIMIT=40]-->
     <string name="owner_info_settings_summary"></string>
     <!-- Hint text shown in owner info edit text [CHAR LIMIT=50] -->
@@ -5006,22 +5002,6 @@
     <!-- Text to display in regulatory info screen (from device overlay). -->
     <string name="regulatory_info_text"></string>
 
-    <!-- NFC unlock -->
-    <string name="lock_settings_nfc_title">NFC Screen Lock Settings</string>
-    <string name="nfc_unlock_paired_tags_title">Paired Tags</string>
-    <string name="nfc_unlock_enabled">Enabled</string>
-    <string name="start_nfc_pairing">Pair with a tag</string>
-
-    <!-- Nfc pair activity strings -->
-    <string name="title_activity_nfc_pairing">NfcPairingActivity</string>
-    <string name="pairing_button_title">Pair now</string>
-    <string name="status_no_ring_detected">Set the tag flat on a table and place the phone on top</string>
-    <string name="status_device_paired">Tag and phone successfully paired, you are done!</string>
-    <string name="status_error_invalid_device">The tag provided cannot be used to unlock your phone</string>
-    <string name="status_error_pairing_failed">The pairing with your tag failed, please try again</string>
-    <string name="enable_nfc">NFC is not enabled and is required for NFC Unlock. Please turn on NFC.</string>
-    <string name="ok">NFC Settings</string>
-
     <!--Dashboard strings-->
     <!-- Text to describe the dashboard fragment title [CHAR LIMIT=16] -->
     <string name="dashboard_title">Settings</string>

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"/>
 
-        <PreferenceScreen
-            android:key="nfc_unlock_set_or_change"
-            android:title="@string/nfc_unlock_title"
-            android:persistent="false"/>
-
     </PreferenceCategory>
 
 </PreferenceScreen>

res/xml/security_settings_chooser.xml

@@ -32,11 +32,6 @@
             android:title="@string/owner_info_settings_title"
             android:summary="@string/owner_info_settings_summary"/>
 
-        <PreferenceScreen
-            android:key="nfc_unlock_set_or_change"
-            android:title="@string/nfc_unlock_title"
-            android:persistent="false"/>
-
     </PreferenceCategory>
 
 </PreferenceScreen>

res/xml/security_settings_password.xml

@@ -44,11 +44,6 @@
             android:title="@string/owner_info_settings_title"
             android:summary="@string/owner_info_settings_summary"/>
 
-        <PreferenceScreen
-            android:key="nfc_unlock_set_or_change"
-            android:title="@string/nfc_unlock_title"
-            android:persistent="false"/>
-
     </PreferenceCategory>
 
 </PreferenceScreen>

res/xml/security_settings_pattern.xml

@@ -48,11 +48,6 @@
             android:title="@string/owner_info_settings_title"
             android:summary="@string/owner_info_settings_summary"/>
 
-        <PreferenceScreen
-            android:key="nfc_unlock_set_or_change"
-            android:title="@string/nfc_unlock_title"
-            android:persistent="false"/>
-
     </PreferenceCategory>
 
 </PreferenceScreen>

res/xml/security_settings_pin.xml

@@ -44,11 +44,6 @@
             android:title="@string/owner_info_settings_title"
             android:summary="@string/owner_info_settings_summary"/>
 
-        <PreferenceScreen
-            android:key="nfc_unlock_set_or_change"
-            android:title="@string/nfc_unlock_title"
-            android:persistent="false"/>
-
     </PreferenceCategory>
 
 </PreferenceScreen>

src/com/android/settings/NfcLockFragment.java

@@ -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);
-        }
-    }
-}

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);