commit f320d6e5c0ecc21fcd8a1f6ed77ce79993e524ff
author Pankaj Garg <pgarg@codeaurora.org> Mon Aug 10 09:56:57 2015 -0700
committer jrizzoli <joey@cyanogenmoditalia.it> Fri Aug 28 13:15:47 2015 +0200
tree 19e15e45d581dfb193214450beb245931fb44c00
parent 1f4cd1a41d5e3370e8b2f386443c6715a10daba3

Fixed resetting of webrefiner

- WebRefiner site specific settings were not properly cleared
  on browser reset to default

Change-Id: I957111763b7b86eb91dc75744ec21deea0425bd5

src/com/android/browser/BrowserYesNoPreference.java

diff --git a/src/com/android/browser/BrowserYesNoPreference.java b/src/com/android/browser/BrowserYesNoPreference.java
index 37e8431..d73ea08 100644
--- a/src/com/android/browser/BrowserYesNoPreference.java
+++ b/src/com/android/browser/BrowserYesNoPreference.java
@@ -28,7 +28,7 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 
-class BrowserYesNoPreference extends DialogPreference {
+public class BrowserYesNoPreference extends DialogPreference {
     private SharedPreferences mPrefs;
     private Context mContext;
     private String mNeutralBtnTxt;
@@ -36,6 +36,10 @@
     private String mNegativeBtnTxt;
     private boolean mNeutralBtnClicked = false;
 
+    public static final int CANCEL_BTN = 0;
+    public static final int OK_BTN = 1;
+    public static final int OTHER_BTN = 2;
+
     // This is the constructor called by the inflater
     public BrowserYesNoPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -154,8 +158,8 @@
 
         if (callChangeListener(result)) {
             setEnabled(false);
-            BrowserSettings settings = BrowserSettings.getInstance();
             if (PreferenceKeys.PREF_CLEAR_SELECTED_DATA.equals(getKey())) {
+                BrowserSettings settings = BrowserSettings.getInstance();
                 if (mPrefs.getBoolean(PreferenceKeys.PREF_PRIVACY_CLEAR_CACHE, false)) {
                     settings.clearCache();
                     settings.clearDatabases();
@@ -176,23 +180,8 @@
                         false)) {
                     settings.clearLocationAccess();
                 }
-
-                setEnabled(true);
-            } else if (PreferenceKeys.PREF_RESET_DEFAULT_PREFERENCES.equals(
-                    getKey())) {
-                if (mNeutralBtnClicked) {
-                    settings.clearCache();
-                    settings.clearDatabases();
-                    settings.clearCookies();
-                    settings.clearHistory();
-                    settings.clearFormData();
-                    settings.clearPasswords();
-                    settings.clearLocationAccess();
-                }
-
-                settings.resetDefaultPreferences();
-                setEnabled(true);
             }
+            setEnabled(true);
         }
     }
 }