summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-05-12 10:37:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-12 10:37:51 -0700
commit728e95b2f831621838fb17f1a4208e5ac1d6b8f5 (patch)
treeacd9d9e5430166ecf9f4d62469a522e4b99597a8 /src
parentddde146f8de213c8e5db3dfedc3dfa2fe7de6f1e (diff)
parent0b53ac733c36e14a5e2e948393360bba00048ccb (diff)
downloadpackages_apps_Settings-728e95b2f831621838fb17f1a4208e5ac1d6b8f5.zip
packages_apps_Settings-728e95b2f831621838fb17f1a4208e5ac1d6b8f5.tar.gz
packages_apps_Settings-728e95b2f831621838fb17f1a4208e5ac1d6b8f5.tar.bz2
am 0b53ac73: merge from open-source master
Merge commit '0b53ac733c36e14a5e2e948393360bba00048ccb' into kraken * commit '0b53ac733c36e14a5e2e948393360bba00048ccb': The password in the APN settings is shown instead of stars
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/ApnEditor.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index 62856d1..e097854 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -458,7 +458,11 @@ public class ApnEditor extends PreferenceActivity
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
Preference pref = findPreference(key);
if (pref != null) {
- pref.setSummary(checkNull(sharedPreferences.getString(key, "")));
+ if (pref.equals(mPassword)){
+ pref.setSummary(starify(sharedPreferences.getString(key, "")));
+ } else {
+ pref.setSummary(checkNull(sharedPreferences.getString(key, "")));
+ }
}
}
}