summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2010-11-04 10:32:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-04 10:32:14 -0700
commit96938b29bbce9a70627e24d5e84069ecea200ceb (patch)
tree9e15432fe05af5471e82cb7d50f95085a4111dc7
parent897e9df8e68772e65917a0345a75e8c3941da9f2 (diff)
parentb93b018ac646e8f8227477719652e1638e69cf4c (diff)
downloadpackages_apps_settings-96938b29bbce9a70627e24d5e84069ecea200ceb.zip
packages_apps_settings-96938b29bbce9a70627e24d5e84069ecea200ceb.tar.gz
packages_apps_settings-96938b29bbce9a70627e24d5e84069ecea200ceb.tar.bz2
am b93b018a: am 91ba0709: Update settings text on success, so we clear out error text after recovery.
* commit 'b93b018ac646e8f8227477719652e1638e69cf4c': Update settings text on success, so we clear out error text after recovery.
-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);
}
}