summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2010-11-03 19:59:47 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-03 19:59:47 -0700
commitb93b018ac646e8f8227477719652e1638e69cf4c (patch)
treed101a68fc5f2d2a4f4470f20f8ae1fb94bb6d277 /src
parent5f3017975ac007c54b16cfa292a29832cb2c3c28 (diff)
parent91ba0709b032d0c80ca086f53552f251a21c6df4 (diff)
downloadpackages_apps_settings-b93b018ac646e8f8227477719652e1638e69cf4c.zip
packages_apps_settings-b93b018ac646e8f8227477719652e1638e69cf4c.tar.gz
packages_apps_settings-b93b018ac646e8f8227477719652e1638e69cf4c.tar.bz2
am 91ba0709: Update settings text on success, so we clear out error text after recovery.
* commit '91ba0709b032d0c80ca086f53552f251a21c6df4': Update settings text on success, so we clear out error text after recovery.
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/nfc/NfcEnabler.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java
index c37c9bb..e3a44b7 100644
--- a/src/com/android/settings/nfc/NfcEnabler.java
+++ b/src/com/android/settings/nfc/NfcEnabler.java
@@ -108,7 +108,11 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
}
if (success) {
Log.d(TAG, "Successfully changed NFC enabled state to " + desiredState);
- // UI will be updated by BroadcastReceiver, above.
+ mHandler.post(new Runnable() {
+ public void run() {
+ handleNfcStateChanged(desiredState);
+ }
+ });
} else {
Log.w(TAG, "Error setting NFC enabled state to " + desiredState);
mHandler.post(new Runnable() {
@@ -126,5 +130,6 @@ 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);
}
}