summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/nfc
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2011-07-07 18:23:04 -0700
committerGilles Debunne <debunne@google.com>2011-07-08 10:05:14 -0700
commitdfc2637ebaee6e7467b0340ec652c29f6b5734ff (patch)
tree7d69d8a69642d8a6687cc184e1d12584e923c70d /src/com/android/settings/nfc
parent6dc0f9639e5c566818930fa183e67927a1b761f8 (diff)
downloadpackages_apps_Settings-dfc2637ebaee6e7467b0340ec652c29f6b5734ff.tar.gz
packages_apps_Settings-dfc2637ebaee6e7467b0340ec652c29f6b5734ff.tar.bz2
packages_apps_Settings-dfc2637ebaee6e7467b0340ec652c29f6b5734ff.zip
Removed summary text and categories in Wireless settings
Bug 5002377 and 5002476. Change-Id: Ia35dd9701f59a18a812b5079396835cc19e6d901
Diffstat (limited to 'src/com/android/settings/nfc')
-rw-r--r--src/com/android/settings/nfc/NfcEnabler.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java
index d1cec1348..dba1329a4 100644
--- a/src/com/android/settings/nfc/NfcEnabler.java
+++ b/src/com/android/settings/nfc/NfcEnabler.java
@@ -16,8 +16,6 @@
package com.android.settings.nfc;
-import com.android.settings.R;
-
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -26,7 +24,6 @@ import android.nfc.NfcAdapter;
import android.os.Handler;
import android.preference.CheckBoxPreference;
import android.preference.Preference;
-import android.provider.Settings;
import android.util.Log;
/**
@@ -98,6 +95,7 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
// Start async update of the NFC adapter state, as the API is
// unfortunately blocking...
new Thread("toggleNFC") {
+ @Override
public void run() {
Log.d(TAG, "Setting NFC enabled state to: " + desiredState);
boolean success = false;
@@ -118,7 +116,6 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
mHandler.post(new Runnable() {
public void run() {
mCheckbox.setEnabled(true);
- mCheckbox.setSummary(R.string.nfc_toggle_error);
}
});
}
@@ -130,6 +127,5 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
private void handleNfcStateChanged(boolean newState) {
mCheckbox.setChecked(newState);
mCheckbox.setEnabled(true);
- mCheckbox.setSummary(R.string.nfc_quick_toggle_summary);
}
}