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

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

Browse Source
This commit is contained in:
Nick Pelly
2011-08-26 17:31:31 -07:00
committed by Android (Google) Code Review
parent 295eb95588 0fb33abfb4
commit 0ef94804de
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;
}

18
src/com/android/settings/nfc/ShareTap.java → src/com/android/settings/nfc/NdefPush.java
View File

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

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