diff options
author | Pankaj Garg <pgarg@codeaurora.org> | 2015-08-10 09:56:57 -0700 |
---|---|---|
committer | jrizzoli <joey@cyanogenmoditalia.it> | 2015-08-28 13:15:47 +0200 |
commit | f320d6e5c0ecc21fcd8a1f6ed77ce79993e524ff (patch) | |
tree | 19e15e45d581dfb193214450beb245931fb44c00 /src/com/android/browser/preferences | |
parent | 1f4cd1a41d5e3370e8b2f386443c6715a10daba3 (diff) | |
download | android_packages_apps_Gello-f320d6e5c0ecc21fcd8a1f6ed77ce79993e524ff.tar.gz android_packages_apps_Gello-f320d6e5c0ecc21fcd8a1f6ed77ce79993e524ff.tar.bz2 android_packages_apps_Gello-f320d6e5c0ecc21fcd8a1f6ed77ce79993e524ff.zip |
Fixed resetting of webrefiner
- WebRefiner site specific settings were not properly cleared
on browser reset to default
Change-Id: I957111763b7b86eb91dc75744ec21deea0425bd5
Diffstat (limited to 'src/com/android/browser/preferences')
-rw-r--r-- | src/com/android/browser/preferences/AdvancedPreferencesFragment.java | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/com/android/browser/preferences/AdvancedPreferencesFragment.java b/src/com/android/browser/preferences/AdvancedPreferencesFragment.java index 00977f64..3d988947 100644 --- a/src/com/android/browser/preferences/AdvancedPreferencesFragment.java +++ b/src/com/android/browser/preferences/AdvancedPreferencesFragment.java @@ -33,12 +33,11 @@ import android.util.Log; import com.android.browser.BaseUi; import com.android.browser.BrowserActivity; import com.android.browser.BrowserSettings; +import com.android.browser.BrowserYesNoPreference; import com.android.browser.DownloadHandler; import com.android.browser.PreferenceKeys; import com.android.browser.R; -import org.codeaurora.swe.PermissionsServiceFactory; - public class AdvancedPreferencesFragment implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener { @@ -157,8 +156,19 @@ public class AdvancedPreferencesFragment else if (pref.getKey().equals(PreferenceKeys.PREF_RESET_DEFAULT_PREFERENCES)) { Integer value = (Integer) objValue; - if (value.intValue() != 0) { - PermissionsServiceFactory.resetDefaultPermissions(); + if (value.intValue() != BrowserYesNoPreference.CANCEL_BTN) { + BrowserSettings settings = BrowserSettings.getInstance(); + if (value.intValue() == BrowserYesNoPreference.OTHER_BTN) { + settings.clearCache(); + settings.clearDatabases(); + settings.clearCookies(); + settings.clearHistory(); + settings.clearFormData(); + settings.clearPasswords(); + settings.clearLocationAccess(); + } + + settings.resetDefaultPreferences(); mFragment.startActivity(new Intent(BrowserActivity.ACTION_RESTART, null, mFragment.getActivity(), BrowserActivity.class)); return true; |