commit e46990ea925f41bdb4d504c91a681e826f4b6eb1
author Nicolas Roard <nicolasroard@google.com> Fri Jun 19 16:27:49 2009 +0100
committer Nicolas Roard <nicolasroard@google.com> Fri Jun 19 16:27:49 2009 +0100
tree 12bc3dabcfcb3ed590c92ad8400d90d9f06b6675
parent f95d52555d649830918f62129339c212a028a84a

New settings UI for HTML5

src/com/android/browser/BrowserYesNoPreference.java

diff --git a/src/com/android/browser/BrowserYesNoPreference.java b/src/com/android/browser/BrowserYesNoPreference.java
index 11a577b..ae93882 100644
--- a/src/com/android/browser/BrowserYesNoPreference.java
+++ b/src/com/android/browser/BrowserYesNoPreference.java
@@ -23,21 +23,11 @@
 
 class BrowserYesNoPreference extends YesNoPreference {
 
-    // This is used for the HTML5 pref UI, where we construct
-    // BrowserYesNoPreference objects on the fly and where we need
-    // to save the corresponding origin.
-    OriginSettings mOrigin = null;
-
     // This is the constructor called by the inflater
     public BrowserYesNoPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public BrowserYesNoPreference(Context context, OriginSettings origin) {
-        super(context);
-        mOrigin = origin;
-    }
-
     @Override
     protected void onDialogClosed(boolean positiveResult) {
         super.onDialogClosed(positiveResult);
@@ -48,6 +38,7 @@
             Context context = getContext();
             if (BrowserSettings.PREF_CLEAR_CACHE.equals(getKey())) {
                 BrowserSettings.getInstance().clearCache(context);
+                BrowserSettings.getInstance().clearDatabases(context);
             } else if (BrowserSettings.PREF_CLEAR_COOKIES.equals(getKey())) {
                 BrowserSettings.getInstance().clearCookies(context);
             } else if (BrowserSettings.PREF_CLEAR_HISTORY.equals(getKey())) {
@@ -56,12 +47,6 @@
                 BrowserSettings.getInstance().clearFormData(context);
             } else if (BrowserSettings.PREF_CLEAR_PASSWORDS.equals(getKey())) {
                 BrowserSettings.getInstance().clearPasswords(context);
-            } else if (BrowserSettings.PREF_CLEAR_DATABASES.equals(getKey())) {
-                BrowserSettings.getInstance().clearDatabases(context);
-            } else if (BrowserSettings.PREF_CLEAR_ALL_DATA.equals(getKey())) {
-                if (mOrigin != null) {
-                    mOrigin.delete();
-                }
             } else if (BrowserSettings.PREF_EXTRAS_RESET_DEFAULTS.equals(
                     getKey())) {
                 BrowserSettings.getInstance().resetDefaultPreferences(context);