diff options
| author | Vivek Sekhar <vsekhar@codeaurora.org> | 2016-01-07 14:40:22 -0800 |
|---|---|---|
| committer | jrizzoli <joey@cyanogenmoditalia.it> | 2016-01-11 22:03:29 +0100 |
| commit | cfb729d9810ddb28ef3485da2bb02699afeae461 (patch) | |
| tree | 4eb4eb2b2e34c93e0b488ad6fe7f61b7e9087074 | |
| parent | 7fa896213d56e59dcec2a1a5096d07fff17398f7 (diff) | |
| download | android_packages_apps_Gello-cfb729d9810ddb28ef3485da2bb02699afeae461.tar.gz android_packages_apps_Gello-cfb729d9810ddb28ef3485da2bb02699afeae461.tar.bz2 android_packages_apps_Gello-cfb729d9810ddb28ef3485da2bb02699afeae461.zip | |
Remove duplicate UI for autofill forms
Remove duplicate UI from Privacy & Security screen which
was a no-op.
CR-Fixed: SWE-6400
Change-Id: I267f6b140f1b01ddaa7c0058436c16af0cc8746e
| -rw-r--r-- | res/xml/privacy_and_security_preferences.xml | 10 | ||||
| -rw-r--r-- | src/com/android/browser/BrowserSettings.java | 5 | ||||
| -rw-r--r-- | src/com/android/browser/PreferenceKeys.java | 1 |
3 files changed, 1 insertions, 15 deletions
diff --git a/res/xml/privacy_and_security_preferences.xml b/res/xml/privacy_and_security_preferences.xml index 888634d2..ddc8773e 100644 --- a/res/xml/privacy_and_security_preferences.xml +++ b/res/xml/privacy_and_security_preferences.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright (c) 2015, The Linux Foundation. All rights reserved. + Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -48,14 +48,6 @@ android:summaryOff="@string/pref_security_not_allowed" android:title="@string/pref_security_remember_passwords" /> - <SwitchPreference - android:layout="@layout/swe_preference" - android:defaultValue="true" - android:key="save_formdata" - android:summaryOn="@string/pref_security_remember" - android:summaryOff="@string/pref_security_not_allowed" - android:title="@string/pref_security_save_form_data" /> - <com.android.browser.mdm.MdmCheckBoxPreference android:layout="@layout/swe_preference" android:defaultValue="true" diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index bc1b83e4..2bdfa0f6 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -332,7 +332,6 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, settings.setLoadsImagesAutomatically(loadImages()); settings.setLoadWithOverviewMode(loadPageInOverviewMode()); settings.setSavePassword(rememberPasswords()); - settings.setSaveFormData(saveFormdata()); settings.setUseWideViewPort(isWideViewport()); settings.setDoNotTrack(doNotTrack()); settings.setNightModeEnabled(isNightModeEnabled()); @@ -1056,10 +1055,6 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, PermissionsServiceFactory.PermissionType.COOKIE); } - public boolean saveFormdata() { - return mPrefs.getBoolean(PREF_SAVE_FORMDATA, true); - } - public boolean enableGeolocation() { return mPrefs.getBoolean(PREF_ENABLE_GEOLOCATION, true); } diff --git a/src/com/android/browser/PreferenceKeys.java b/src/com/android/browser/PreferenceKeys.java index 135ecb30..b4b2976e 100644 --- a/src/com/android/browser/PreferenceKeys.java +++ b/src/com/android/browser/PreferenceKeys.java @@ -98,7 +98,6 @@ public interface PreferenceKeys { static final String PREF_PRIVACY_CLEAR_HISTORY = "privacy_clear_history"; static final String PREF_PRIVACY_CLEAR_PASSWORDS = "privacy_clear_passwords"; static final String PREF_REMEMBER_PASSWORDS = "remember_passwords"; - static final String PREF_SAVE_FORMDATA = "save_formdata"; static final String PREF_SHOW_SECURITY_WARNINGS = "show_security_warnings"; static final String PREF_DO_NOT_TRACK = "do_not_track"; static final String PREF_WEB_REFINER = "web_refiner"; |