summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/nfc
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2011-07-27 17:31:41 -0500
committerMartijn Coenen <maco@google.com>2011-07-27 17:31:41 -0500
commitbb4bdc29d64714546255681fcd9c9d92efa9328f (patch)
tree632521639a25260871e983d7afefb6a15329a124 /src/com/android/settings/nfc
parent7485addd8c230812b33f7043de3ff47d97b79bc1 (diff)
downloadpackages_apps_Settings-bb4bdc29d64714546255681fcd9c9d92efa9328f.zip
packages_apps_Settings-bb4bdc29d64714546255681fcd9c9d92efa9328f.tar.gz
packages_apps_Settings-bb4bdc29d64714546255681fcd9c9d92efa9328f.tar.bz2
Add on/off actionbar switch for NFC Tap To Share.
Change-Id: I009a31d8862a23e15d89fe9813eca02e06469531
Diffstat (limited to 'src/com/android/settings/nfc')
-rw-r--r--src/com/android/settings/nfc/ZeroClick.java55
1 files changed, 40 insertions, 15 deletions
diff --git a/src/com/android/settings/nfc/ZeroClick.java b/src/com/android/settings/nfc/ZeroClick.java
index 7868662..4d657d9 100644
--- a/src/com/android/settings/nfc/ZeroClick.java
+++ b/src/com/android/settings/nfc/ZeroClick.java
@@ -16,28 +16,54 @@
package com.android.settings.nfc;
+import android.app.ActionBar;
+import android.app.Activity;
import android.app.Fragment;
-import android.content.ContentResolver;
import android.nfc.NfcAdapter;
import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.Preference;
-import android.provider.Settings;
+import android.preference.PreferenceActivity;
+import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.CheckBox;
import android.widget.CompoundButton;
-import android.widget.EditText;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.util.Log;
+import android.widget.Switch;
import com.android.settings.R;
public class ZeroClick extends Fragment
implements CompoundButton.OnCheckedChangeListener {
private View mView;
- private CheckBox mCheckbox;
private NfcAdapter mNfcAdapter;
+ private Switch mActionBarSwitch;
+
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ Activity activity = getActivity();
+
+ mActionBarSwitch = new Switch(activity);
+
+ if (activity instanceof PreferenceActivity) {
+ PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
+ if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
+ final int padding = activity.getResources().getDimensionPixelSize(
+ R.dimen.action_bar_switch_padding);
+ mActionBarSwitch.setPadding(0, 0, padding, 0);
+ activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+ ActionBar.DISPLAY_SHOW_CUSTOM);
+ activity.getActionBar().setCustomView(mActionBarSwitch, new ActionBar.LayoutParams(
+ ActionBar.LayoutParams.WRAP_CONTENT,
+ ActionBar.LayoutParams.WRAP_CONTENT,
+ Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+ }
+ }
+
+ mActionBarSwitch.setOnCheckedChangeListener(this);
+
+ mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
+ mActionBarSwitch.setChecked(mNfcAdapter.zeroClickEnabled());
+ }
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -48,10 +74,9 @@ public class ZeroClick extends Fragment
}
private void initView(View view) {
- mCheckbox = (CheckBox) mView.findViewById(R.id.zeroclick_checkbox);
- mCheckbox.setOnCheckedChangeListener(this);
mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
- mCheckbox.setChecked(mNfcAdapter.zeroClickEnabled());
+ mActionBarSwitch.setOnCheckedChangeListener(this);
+ mActionBarSwitch.setChecked(mNfcAdapter.zeroClickEnabled());
}
@Override
@@ -67,15 +92,15 @@ public class ZeroClick extends Fragment
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean desiredState) {
boolean success = false;
- mCheckbox.setEnabled(false);
+ mActionBarSwitch.setEnabled(false);
if (desiredState) {
success = mNfcAdapter.enableZeroClick();
} else {
success = mNfcAdapter.disableZeroClick();
}
if (success) {
- mCheckbox.setChecked(desiredState);
+ mActionBarSwitch.setChecked(desiredState);
}
- mCheckbox.setEnabled(true);
+ mActionBarSwitch.setEnabled(true);
}
}