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

10
src/com/android/settings/WirelessSettings.java
View File

@@ -41,7 +41,7 @@ public class WirelessSettings extends SettingsPreferenceFragment {
private static final String KEY_TOGGLE_AIRPLANE = "toggle_airplane";
private static final String KEY_TOGGLE_NFC = "toggle_nfc";
private static final String KEY_ZEROCLICK_SETTINGS = "zeroclick_settings";
private static final String KEY_NDEF_PUSH_SETTINGS = "ndef_push_settings";
private static final String KEY_VPN_SETTINGS = "vpn_settings";
private static final String KEY_WIFI_P2P_SETTINGS = "wifi_p2p_settings";
private static final String KEY_TETHER_SETTINGS = "tether_settings";
@@ -96,10 +96,10 @@ public class WirelessSettings extends SettingsPreferenceFragment {
final Activity activity = getActivity();
mAirplaneModePreference = (CheckBoxPreference) findPreference(KEY_TOGGLE_AIRPLANE);
CheckBoxPreference nfc = (CheckBoxPreference) findPreference(KEY_TOGGLE_NFC);
PreferenceScreen zeroclick = (PreferenceScreen) findPreference(KEY_ZEROCLICK_SETTINGS);
PreferenceScreen ndefPush = (PreferenceScreen) findPreference(KEY_NDEF_PUSH_SETTINGS);
mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
mNfcEnabler = new NfcEnabler(activity, nfc, zeroclick);
mNfcEnabler = new NfcEnabler(activity, nfc, ndefPush);
String toggleable = Settings.System.getString(activity.getContentResolver(),
Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
@@ -117,14 +117,14 @@ public class WirelessSettings extends SettingsPreferenceFragment {
// Manually set dependencies for NFC when not toggleable.
if (toggleable == null || !toggleable.contains(Settings.System.RADIO_NFC)) {
findPreference(KEY_TOGGLE_NFC).setDependency(KEY_TOGGLE_AIRPLANE);
findPreference(KEY_ZEROCLICK_SETTINGS).setDependency(KEY_TOGGLE_AIRPLANE);
findPreference(KEY_NDEF_PUSH_SETTINGS).setDependency(KEY_TOGGLE_AIRPLANE);
}
// Remove NFC if its not available
mNfcAdapter = NfcAdapter.getDefaultAdapter(activity);
if (mNfcAdapter == null) {
getPreferenceScreen().removePreference(nfc);
getPreferenceScreen().removePreference(zeroclick);
getPreferenceScreen().removePreference(ndefPush);
mNfcEnabler = null;
}