Use tiles for bookmarks

- Use tile based bitmap for bookmarks and history
- Settings UI cleanup

Change-Id: If959cb0b8f110035b8dd2fefe8106e9c5d30f4f1

17 files changed, 148 insertions, 107 deletions

diff --git a/res/drawable-xxhdpi/img_tile_background.9.png b/res/drawable-xxhdpi/img_tile_background.9.png
new file mode 100644
index 00000000..9ef7ae5a
--- /dev/null
+++ b/res/drawable-xxhdpi/img_tile_background.9.png
diff --git a/res/layout/bookmark_thumbnail.xml b/res/layout/bookmark_thumbnail.xml
index df9e8535..8913551d 100644
--- a/res/layout/bookmark_thumbnail.xml
+++ b/res/layout/bookmark_thumbnail.xml
@@ -18,46 +18,24 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:paddingStart="@dimen/combo_horizontalSpacing"
-    android:paddingEnd="@dimen/combo_horizontalSpacing"
     android:layout_margin="@dimen/combo_bookmark_thumbnail_margin"
-    android:background="@drawable/bookmark_thumb_selector"
     android:orientation="vertical"
-    >
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.android.browser.view.BookmarkThumbImageView
-            android:id="@+id/thumb_image"
-            android:layout_width="@dimen/bookmarkThumbnailWidth"
-            android:layout_height="@dimen/bookmarkThumbnailHeight"
-            android:paddingTop="2dip"
-            android:scaleType="centerCrop"
-            android:src="@drawable/browser_thumbnail"
-            />
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:background="@color/bookmarkWidgetFolderBackground"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/label"
-                android:layout_width="@dimen/bookmarkThumbnailWidth"
-                android:layout_height="wrap_content"
-                android:ellipsize="marquee"
-                android:paddingStart="8dip"
-                android:paddingEnd="4dip"
-                android:paddingTop="2dip"
-                android:paddingBottom="2dip"
-                android:singleLine="true"
-                android:textAppearance="@style/BookmarkText"
-                />
-        </LinearLayout>
-    </FrameLayout>
-
+    android:paddingEnd="@dimen/combo_horizontalSpacing"
+    android:paddingStart="@dimen/combo_horizontalSpacing" >
+
+    <com.android.browser.SiteTileView
+        android:id="@+id/thumb_image"
+        android:layout_width="@dimen/bookmarkThumbnailWidth"
+        android:layout_height="@dimen/bookmarkThumbnailHeight" />
+
+    <TextView
+        android:id="@+id/label"
+        android:layout_width="@dimen/bookmarkThumbnailWidth"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:ellipsize="marquee"
+        android:lines="2"
+        android:paddingBottom="2dip"
+        android:paddingTop="2dip"
+        android:textAppearance="@style/BookmarkText" />
 </com.android.browser.view.BookmarkContainer>
diff --git a/res/layout/bookmarks.xml b/res/layout/bookmarks.xml
index d4238f5c..7eee4e9b 100644
--- a/res/layout/bookmarks.xml
+++ b/res/layout/bookmarks.xml
@@ -18,6 +18,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:background="@color/comboViewBackground"
     android:paddingTop="@dimen/combo_paddingTop">
 
     <FrameLayout
diff --git a/res/layout/history.xml b/res/layout/history.xml
index 1636fe6a..c2444233 100644
--- a/res/layout/history.xml
+++ b/res/layout/history.xml
@@ -19,6 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:background="@color/comboViewBackground"
     android:paddingTop="@dimen/combo_paddingTop">
 
     <FrameLayout
diff --git a/res/layout/history_item.xml b/res/layout/history_item.xml
index cd236d5e..332dc364 100644
--- a/res/layout/history_item.xml
+++ b/res/layout/history_item.xml
@@ -20,15 +20,12 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal">
 
-    <ImageView
+    <com.android.browser.SiteTileView
         android:id="@+id/favicon"
-        android:layout_width="32dip"
-        android:layout_height="32dip"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="12dip"
-        android:background="@drawable/bookmark_list_favicon_bg"
-        android:scaleType="fitXY"
-        android:src="@drawable/ic_deco_favicon_normal" />
+        android:layout_width="36dip"
+        android:layout_height="36dip"
+        android:layout_gravity="center"
+        android:layout_marginStart="12dip" />
 
     <LinearLayout
         android:layout_width="0dip"
diff --git a/res/layout/site_specific_security_info.xml b/res/layout/site_specific_security_info.xml
index 31560df4..700d0c27 100644
--- a/res/layout/site_specific_security_info.xml
+++ b/res/layout/site_specific_security_info.xml
@@ -31,7 +31,6 @@
     android:id="@+id/site_security_info"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="?android:attr/scrollbarSize"
     android:paddingEnd="?android:attr/scrollbarSize"
     android:minHeight="?android:attr/listPreferredItemHeightSmall"
     android:gravity="center_vertical"
@@ -50,10 +49,15 @@
             android:minHeight="?android:attr/listPreferredItemHeightSmall"
             android:gravity="center_vertical"
             >
+            <!--Padding-->
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dip" />
+
             <ImageView
                 android:gravity="center"
                 android:src="@drawable/ic_sp_level_severe"
-                android:minWidth="40dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
 
@@ -61,6 +65,7 @@
                 android:id="@+id/security_view_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="10dip"
                 android:gravity="start" />
         </LinearLayout>
 
@@ -72,10 +77,15 @@
             android:minHeight="?android:attr/listPreferredItemHeightSmall"
             android:gravity="center_vertical"
             >
+            <!--Padding-->
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dip" />
+
             <ImageView
                 android:gravity="center"
                 android:src="@drawable/ic_sp_level_warning"
-                android:minWidth="40dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
 
@@ -83,6 +93,7 @@
                 android:id="@id/security_view_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="10dip"
                 android:gravity="start" />
         </LinearLayout>
 
@@ -94,10 +105,15 @@
             android:minHeight="?android:attr/listPreferredItemHeightSmall"
             android:gravity="center_vertical"
             >
+            <!--Padding-->
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dip" />
+
             <ImageView
                 android:src="@drawable/ic_sp_level_good"
                 android:gravity="center"
-                android:minWidth="40dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
 
@@ -105,6 +121,7 @@
                 android:id="@id/security_view_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="10dip"
                 android:gravity="start" />
         </LinearLayout>
     </LinearLayout>
diff --git a/res/layout/snapshot_item.xml b/res/layout/snapshot_item.xml
index 01153564..c3ce866c 100644
--- a/res/layout/snapshot_item.xml
+++ b/res/layout/snapshot_item.xml
@@ -53,8 +53,7 @@
         android:paddingStart="8dip"
         android:gravity="center_vertical"
         android:typeface="sans"
-        android:textSize="12sp"
-        android:textColor="#AAAAAA"
+        android:textAppearance="@style/BookmarkText"
         android:lines="2" />
     <ImageView
         android:id="@+id/divider"
diff --git a/res/layout/snapshots.xml b/res/layout/snapshots.xml
index 30d4ca44..d01809e6 100644
--- a/res/layout/snapshots.xml
+++ b/res/layout/snapshots.xml
@@ -18,6 +18,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/comboViewBackground"
     android:paddingTop="@dimen/combo_paddingTop">
 
     <com.android.browser.view.SnapshotGridView
diff --git a/res/layout/swe_preference_custom_actionbar.xml b/res/layout/swe_preference_custom_actionbar.xml
index 9dca94df..44eb1de7 100644
--- a/res/layout/swe_preference_custom_actionbar.xml
+++ b/res/layout/swe_preference_custom_actionbar.xml
@@ -30,7 +30,7 @@
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/reset"
     android:drawableEnd="@drawable/ic_sp_revert"
-    android:text="@string/pref_extras_reset_default"
+    android:text="@string/pref_extras_reset"
     android:background="@android:color/transparent"
     android:layout_gravity="end"
     android:layout_width="wrap_content"
diff --git a/res/values-land/dimensions.xml b/res/values-land/dimensions.xml
index 262ca488..5fd3d125 100644
--- a/res/values-land/dimensions.xml
+++ b/res/values-land/dimensions.xml
@@ -17,5 +17,5 @@
     <dimen name="preference_widget_width">72dp</dimen>
     <dimen name="nav_tab_width">225dip</dimen>
     <dimen name="nav_tab_height">150dip</dimen>
-    <dimen name="combo_paddingTop">60dip</dimen>
+    <dimen name="combo_paddingTop">56dip</dimen>
 </resources>
diff --git a/res/values-v17/styles.xml b/res/values-v17/styles.xml
index 73eed02e..f251c030 100644
--- a/res/values-v17/styles.xml
+++ b/res/values-v17/styles.xml
@@ -62,9 +62,11 @@
     </style>
 
     <style name="BookmarkText">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@color/white</item>
-        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">@color/black</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textAlignment">center</item>
+        <item name="android:fontFamily">roboto</item>
     </style>
 
     <style name="ShortcutTheme" parent="@style/BrowserBase">
diff --git a/res/values/attrs_site_tile_view.xml b/res/values/attrs_site_tile_view.xml
new file mode 100644
index 00000000..1cc6c59c
--- /dev/null
+++ b/res/values/attrs_site_tile_view.xml
@@ -0,0 +1,35 @@
+<!--
+    Copyright (c) 2015, 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
+    met:
+        * Redistributions of source code must retain the above copyright
+          notice, this list of conditions and the following disclaimer.
+        * Redistributions in binary form must reproduce the above
+          copyright notice, this list of conditions and the following
+          disclaimer in the documentation and/or other materials provided
+          with the distribution.
+        * Neither the name of The Linux Foundation nor the names of its
+          contributors may be used to endorse or promote products derived
+          from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<resources>
+    <declare-styleable name="SiteTileView">
+        <attr name="android:src" />
+        <attr name="flat" format="boolean|reference" />
+        <attr name="floating" format="boolean|reference" />
+    </declare-styleable>
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 480ca7d6..3efdd390 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -49,8 +49,11 @@
     <color name="bookmarkListFaviconBackground">#23ffffff</color>
     <color name="bookmarkLabelColor">#555555</color>
     <color name="comboViewActionBarColor">#ffffff</color>
+    <color name="comboViewBackground">#efeff0</color>
     <color name="tabFaviconBackground">#FF555555</color>
     <color name="tabFocusHighlight">#FF99CC00</color>
     <color name="tabViewTitleBackground">#D0000000</color>
     <color name="navtab_bg">#80606060</color>
+
+    <color name="SiteTileOverline">#666</color>
 </resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 9ddfb98e..f2e47100 100755
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -19,8 +19,8 @@
     <dimen name="tab_slice">15.5dp</dimen>
     <dimen name="tab_focus_stroke">2dip</dimen>
     <dimen name="max_tab_width">300dp</dimen>
-    <dimen name="bookmarkThumbnailWidth">100dip</dimen>
-    <dimen name="bookmarkThumbnailHeight">100dip</dimen>
+    <dimen name="bookmarkThumbnailWidth">90dip</dimen>
+    <dimen name="bookmarkThumbnailHeight">90dip</dimen>
     <!--Add for Navigation Feature -->
     <dimen name="mynav_item_width">80px</dimen>
     <dimen name="mynav_item_width_portrait">80px</dimen>
@@ -48,8 +48,8 @@
     <dimen name="widgetVerticalSpacing">6dip</dimen>
     <dimen name="widgetColumnWidth">80dip</dimen>
     <!-- For the combined Bookmarks History view -->
-    <dimen name="combo_paddingTop">50dip</dimen>
-    <dimen name="combo_horizontalSpacing">6dip</dimen>
+    <dimen name="combo_paddingTop">48dip</dimen>
+    <dimen name="combo_horizontalSpacing">8dip</dimen>
     <dimen name="combo_bookmark_thumbnail_margin">4dip</dimen>
     <dimen name="combo_snapshot_item_padding">12dip</dimen>
     <dimen name="combo_shadow_height">8dip</dimen>
@@ -85,4 +85,6 @@
     <dimen name="edge_swipe_in_slop">25dp</dimen>
     <dimen name="edge_swipe_in_additional_slop">50dp</dimen>
     <dimen name="edge_swipe_out_slop">18dp</dimen>
+
+    <dimen name="SiteTileOverline">1dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f0436c9c..3172642e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -529,7 +529,7 @@
     <!-- Settings summmary -->
     <string name="pref_security_show_security_warning_summary">Show warning if there\'s a problem with a site\'s security</string>
     <!-- Settings Label -->
-    <string name="pref_do_not_track">Do Not Track</string>
+    <string name="pref_do_not_track">Request \'Do Not Track\'</string>
     <!-- Settings summary -->
     <string name="pref_do_not_track_summary">Send a Do Not Track request with your browsing traffic</string>
     <!-- Settings label -->
@@ -539,13 +539,15 @@
 
     <string name="pref_security_allow_mic">Microphone</string>
     <string name="pref_security_allow_camera">Camera</string>
-    <string name="pref_security_web_refiner">Ads and Distracting Content</string>
-    <string name="pref_security_accept_third_party_cookies">Third Party Cookies</string>
+    <string name="pref_security_web_refiner">Ads and distracting content</string>
+    <string name="pref_security_accept_third_party_cookies">Third party cookies</string>
     <string name="pref_security_ask_before_using">Ask before using</string>
     <string name="pref_security_allowed">Allowed</string>
     <string name="pref_security_not_allowed">Not allowed</string>
     <string name="pref_security_remember">Remember</string>
     <string name="pref_security_protect">Protect by default</string>
+    <string name="pref_security_on">On</string>
+    <string name="pref_security_off">Off</string>
     <string name="pref_website_title">Website</string>
     <string name="pref_security_add">Add</string>
     <string name="pref_security_cancel">Cancel</string>
@@ -597,13 +599,14 @@
     <!-- Settings screen, section title [CHAR LIMIT=50] -->
     <string name="pref_extras_title">Advanced</string>
     <!-- Settings label -->
-    <string name="pref_extras_website_settings">Per Site Settings</string>
+    <string name="pref_extras_website_settings">Per site settings</string>
     <!-- Settings summary -->
     <string name="pref_extras_website_settings_summary">Advanced settings for individual websites</string>
     <!-- Settings category label [CHAR-LIMIT=50] -->
     <string name="pref_extras_reset_default_title">Reset defaults</string>
     <!-- Settings label -->
     <string name="pref_extras_reset_default">Reset to default</string>
+    <string name="pref_extras_reset">Reset</string>
     <!-- Settings summary -->
     <string name="pref_extras_reset_default_summary">Restore default settings</string>
     <!-- Confirmation dialog message -->
@@ -667,7 +670,7 @@
         <item>auto</item>
     </string-array>
     <string name="pref_default_text_encoding_default">UTF-8</string>
-    <string name="pref_edge_swipe_title">Edge Swipe</string>
+    <string name="pref_edge_swipe_title">Edge swipe</string>
     <string name="pref_edge_swipe_option_msg">When swiping, would you like:</string>
     <string name="pref_temporal_edge_swipe">Previous/Next Web Site</string>
     <string name="pref_spatial_edge_swipe">Change Tab</string>
@@ -890,7 +893,7 @@
     <string name="webstorage_outofspace_notification_text">Touch to free up space.</string>
     <!-- Used in the Browser Settings -->
     <string name="webstorage_clear_data_title">Storage</string>
-    <string name="webstorage_private_data_title">Private Data</string>
+    <string name="webstorage_private_data_title">Private data</string>
 
     <!-- Confirmation dialog when the user ask to clear all data for an origin -->
     <string name="webstorage_clear_data_dialog_message">Delete all data stored by this website?</string>
diff --git a/res/xml/privacy_and_security_preferences.xml b/res/xml/privacy_and_security_preferences.xml
index 37eeaf8b..b15509fe 100644
--- a/res/xml/privacy_and_security_preferences.xml
+++ b/res/xml/privacy_and_security_preferences.xml
@@ -36,8 +36,8 @@
             android:layout="@layout/swe_preference"
             android:defaultValue="true"
             android:key="do_not_track"
-            android:summaryOn="@string/pref_security_protect"
-            android:summaryOff="@string/pref_security_not_allowed"
+            android:summaryOn="@string/pref_security_on"
+            android:summaryOff="@string/pref_security_off"
             android:title="@string/pref_do_not_track" />
 
         <SwitchPreference
@@ -128,6 +128,24 @@
         android:title="@string/pref_default_site_settings_title">
         <SwitchPreference
             android:layout="@layout/swe_preference"
+            android:defaultValue="false"
+            android:icon="@drawable/ic_sp_webrefiner"
+            android:key="distracting_contents"
+            android:summaryOn="@string/pref_security_allowed"
+            android:summaryOff="@string/pref_security_not_allowed"
+            android:title="@string/pref_security_web_refiner" />
+
+        <SwitchPreference
+            android:layout="@layout/swe_preference"
+            android:defaultValue="true"
+            android:icon="@drawable/ic_sp_thirdcookies"
+            android:key="accept_cookies"
+            android:summaryOn="@string/pref_security_allowed"
+            android:summaryOff="@string/pref_security_not_allowed"
+            android:title="@string/pref_security_accept_cookies" />
+
+        <SwitchPreference
+            android:layout="@layout/swe_preference"
             android:defaultValue="true"
             android:icon="@drawable/ic_sp_location"
             android:key="enable_geolocation"
@@ -156,29 +174,11 @@
         <SwitchPreference
             android:layout="@layout/swe_preference"
             android:defaultValue="false"
-            android:icon="@drawable/ic_sp_webrefiner"
-            android:key="distracting_contents"
-            android:summaryOn="@string/pref_security_allowed"
-            android:summaryOff="@string/pref_security_not_allowed"
-            android:title="@string/pref_security_web_refiner" />
-
-        <SwitchPreference
-            android:layout="@layout/swe_preference"
-            android:defaultValue="false"
             android:icon="@drawable/ic_sp_popups"
             android:key="popup_windows"
             android:summaryOn="@string/pref_security_allowed"
             android:summaryOff="@string/pref_security_not_allowed"
             android:title="@string/pref_security_allow_popups" />
 
-        <SwitchPreference
-            android:layout="@layout/swe_preference"
-            android:defaultValue="true"
-            android:icon="@drawable/ic_sp_thirdcookies"
-            android:key="accept_cookies"
-            android:summaryOn="@string/pref_security_allowed"
-            android:summaryOff="@string/pref_security_not_allowed"
-            android:title="@string/pref_security_accept_cookies" />
-
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/res/xml/site_specific_preferences.xml b/res/xml/site_specific_preferences.xml
index 19aac5cd..63e03b0f 100644
--- a/res/xml/site_specific_preferences.xml
+++ b/res/xml/site_specific_preferences.xml
@@ -36,6 +36,7 @@
         android:title="@string/pref_website_title" >
         <Preference
             android:layout="@layout/swe_preference"
+            android:selectable="false"
             android:key="site_name"/>
     </PreferenceCategory>
 
@@ -46,6 +47,7 @@
 
         <PreferenceScreen
             android:key="site_security_info"
+            android:selectable="false"
             android:layout="@layout/site_specific_security_info"/>
     </PreferenceCategory>
 
@@ -54,6 +56,24 @@
         android:layout="@layout/swe_preference_category"
         android:key="reset_default">
 
+        <SwitchPreference
+            android:layout="@layout/swe_preference"
+            android:defaultValue="false"
+            android:icon="@drawable/ic_sp_webrefiner"
+            android:key="distracting_contents"
+            android:summaryOn="@string/pref_security_allowed"
+            android:summaryOff="@string/pref_security_not_allowed"
+            android:title="@string/pref_security_web_refiner" />
+
+        <SwitchPreference
+            android:layout="@layout/swe_preference"
+            android:defaultValue="true"
+            android:icon="@drawable/ic_sp_thirdcookies"
+            android:key="accept_cookies"
+            android:summaryOn="@string/pref_security_allowed"
+            android:summaryOff="@string/pref_security_not_allowed"
+            android:title="@string/pref_security_accept_cookies" />
+
         <ListPreference
             android:layout="@layout/swe_preference"
             android:widgetLayout="@layout/swe_preference_list_widget"
@@ -85,30 +105,12 @@
         <SwitchPreference
             android:layout="@layout/swe_preference"
             android:defaultValue="false"
-            android:icon="@drawable/ic_sp_webrefiner"
-            android:key="distracting_contents"
-            android:summaryOn="@string/pref_security_allowed"
-            android:summaryOff="@string/pref_security_not_allowed"
-            android:title="@string/pref_security_web_refiner" />
-
-        <SwitchPreference
-            android:layout="@layout/swe_preference"
-            android:defaultValue="false"
             android:icon="@drawable/ic_sp_popups"
             android:key="popup_windows"
             android:summaryOn="@string/pref_security_allowed"
             android:summaryOff="@string/pref_security_not_allowed"
             android:title="@string/pref_security_allow_popups" />
 
-        <SwitchPreference
-            android:layout="@layout/swe_preference"
-            android:defaultValue="true"
-            android:icon="@drawable/ic_sp_thirdcookies"
-            android:key="accept_cookies"
-            android:summaryOn="@string/pref_security_allowed"
-            android:summaryOff="@string/pref_security_not_allowed"
-            android:title="@string/pref_security_accept_cookies" />
-
         <Preference
             android:layout="@layout/swe_preference"
             android:widgetLayout="@layout/swe_preference_trashcan_widget"