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

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

Browse Source 
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
This commit is contained in:
Nick Pelly
2011-08-23 19:35:13 -07:00
parent 2aaf687aa6
commit 0fb33abfb4
8 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/android/settings/nfc/NfcEnabler.java
View File

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