Rename {zeroclick, share_tap} -> ndef_push in code.

Not sure what the product name will be, but ndef push seems to be a
nice neutral name for the code.

Text strings are left as "Share Tap" for now.

Change-Id: I9dbf82eda2273220c23f443710a340c2c93e8291

2 files changed, 21 insertions, 21 deletions

diff --git a/src/com/android/settings/nfc/ShareTap.java b/src/com/android/settings/nfc/NdefPush.java
index e434781..bbe3f32 100644
--- a/src/com/android/settings/nfc/ShareTap.java
+++ b/src/com/android/settings/nfc/NdefPush.java
@@ -33,7 +33,7 @@ import android.widget.ImageView;
 import android.widget.Switch;
 import com.android.settings.R;
 
-public class ShareTap extends Fragment
+public class NdefPush extends Fragment
         implements CompoundButton.OnCheckedChangeListener {
     private View mView;
     private AnimationDrawable mAnimation;
@@ -61,35 +61,35 @@ public class ShareTap extends Fragment
                         ActionBar.LayoutParams.WRAP_CONTENT,
                         ActionBar.LayoutParams.WRAP_CONTENT,
                         Gravity.CENTER_VERTICAL | Gravity.RIGHT));
-                activity.getActionBar().setTitle(R.string.zeroclick_settings_title);
+                activity.getActionBar().setTitle(R.string.ndef_push_settings_title);
             }
         }
 
         mActionBarSwitch.setOnCheckedChangeListener(this);
 
         mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
-        mActionBarSwitch.setChecked(mNfcAdapter.isZeroClickEnabled());
+        mActionBarSwitch.setChecked(mNfcAdapter.isNdefPushEnabled());
     }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-        mView = inflater.inflate(R.layout.sharetap, container, false);
+        mView = inflater.inflate(R.layout.ndefpush, container, false);
         initView(mView);
         return mView;
     }
 
     private void initView(View view) {
         mActionBarSwitch.setOnCheckedChangeListener(this);
-        mActionBarSwitch.setChecked(mNfcAdapter.isZeroClickEnabled());
+        mActionBarSwitch.setChecked(mNfcAdapter.isNdefPushEnabled());
     }
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        mImageView = (ImageView) getActivity().findViewById(R.id.sharetap_image);
-        mImageView.setBackgroundResource(R.drawable.sharetap_anim);
+        mImageView = (ImageView) getActivity().findViewById(R.id.ndef_push_image);
+        mImageView.setBackgroundResource(R.drawable.ndef_push_anim);
         mAnimation = (AnimationDrawable) mImageView.getBackground();
 
     }
@@ -117,9 +117,9 @@ public class ShareTap extends Fragment
         boolean success = false;
         mActionBarSwitch.setEnabled(false);
         if (desiredState) {
-            success = mNfcAdapter.enableZeroClick();
+            success = mNfcAdapter.enableNdefPush();
         } else {
-            success = mNfcAdapter.disableZeroClick();
+            success = mNfcAdapter.disableNdefPush();
         }
         if (success) {
             mActionBarSwitch.setChecked(desiredState);
diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java
index 722787d..9cf117d 100644
--- a/src/com/android/settings/nfc/NfcEnabler.java
+++ b/src/com/android/settings/nfc/NfcEnabler.java
@@ -39,7 +39,7 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
 
     private final Context mContext;
     private final CheckBoxPreference mCheckbox;
-    private final PreferenceScreen mZeroClick;
+    private final PreferenceScreen mNdefPush;
     private final NfcAdapter mNfcAdapter;
     private final IntentFilter mIntentFilter;
     private final Handler mHandler = new Handler();
@@ -56,16 +56,16 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
     };
 
     public NfcEnabler(Context context, CheckBoxPreference checkBoxPreference,
-            PreferenceScreen zeroclick) {
+            PreferenceScreen ndefPush) {
         mContext = context;
         mCheckbox = checkBoxPreference;
-        mZeroClick = zeroclick;
+        mNdefPush = ndefPush;
         mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
 
         if (mNfcAdapter == null) {
             // NFC is not supported
             mCheckbox.setEnabled(false);
-            mZeroClick.setEnabled(false);
+            mNdefPush.setEnabled(false);
             mIntentFilter = null;
             return;
         }
@@ -109,28 +109,28 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
         case NfcAdapter.STATE_OFF:
             mCheckbox.setChecked(false);
             mCheckbox.setEnabled(true);
-            mZeroClick.setEnabled(false);
-            mZeroClick.setSummary(R.string.zeroclick_off_summary);
+            mNdefPush.setEnabled(false);
+            mNdefPush.setSummary(R.string.ndef_push_settings_summary);
             break;
         case NfcAdapter.STATE_ON:
             mCheckbox.setChecked(true);
             mCheckbox.setEnabled(true);
-            mZeroClick.setEnabled(true);
-            if (mNfcAdapter.isZeroClickEnabled()) {
-                mZeroClick.setSummary(R.string.zeroclick_on_summary);
+            mNdefPush.setEnabled(true);
+            if (mNfcAdapter.isNdefPushEnabled()) {
+                mNdefPush.setSummary(R.string.ndef_push_on_summary);
             } else {
-                mZeroClick.setSummary(R.string.zeroclick_off_summary);
+                mNdefPush.setSummary(R.string.ndef_push_off_summary);
             }
             break;
         case NfcAdapter.STATE_TURNING_ON:
             mCheckbox.setChecked(true);
             mCheckbox.setEnabled(false);
-            mZeroClick.setEnabled(false);
+            mNdefPush.setEnabled(false);
             break;
         case NfcAdapter.STATE_TURNING_OFF:
             mCheckbox.setChecked(false);
             mCheckbox.setEnabled(false);
-            mZeroClick.setEnabled(false);
+            mNdefPush.setEnabled(false);
             break;
         }
     }