commit c33e55b70b3b6be64a7a840b828602c426916424
author Michael Kolb <kolby@google.com> Tue Jan 25 15:55:15 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 25 15:55:15 2011 -0800
tree c41a4da5ebb5333c50631a3b6222c6c5cfa972ad
parent 570d8144c4e1683bf45376e8c4aca894be915485
parent 2d59c32ee3fc1ed92d57609998f0430ad7695317

Merge "add tab bar animations" into honeycomb

src/com/android/browser/preferences/PrivacySecurityPreferencesFragment.java

diff --git a/src/com/android/browser/preferences/PrivacySecurityPreferencesFragment.java b/src/com/android/browser/preferences/PrivacySecurityPreferencesFragment.java
index c0cf3cf..91705e5 100644
--- a/src/com/android/browser/preferences/PrivacySecurityPreferencesFragment.java
+++ b/src/com/android/browser/preferences/PrivacySecurityPreferencesFragment.java
@@ -44,6 +44,11 @@
 
         Preference e = findPreference(BrowserSettings.PREF_CLEAR_HISTORY);
         e.setOnPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
         setupAutoLoginPreference();
     }
 
@@ -66,6 +71,8 @@
         values[i] = "";
         autologinPref.setEntries(names);
         autologinPref.setEntryValues(values);
+        autologinPref.setValue(BrowserSettings.getInstance()
+                .getAutoLoginAccount(getActivity()));
     }
 
     private void updateAutoLoginSummary(Preference pref) {