commit 21dad566a57084c8c5eae66909f917ff7c1fd222
author Pankaj Garg <pgarg@codeaurora.org> Thu Jul 02 17:17:24 2015 -0700
committer jrizzoli <joey@cyanogenmoditalia.it> Fri Aug 28 13:15:45 2015 +0200
tree 6ad508be6d8cebba36c7521e01e8d80c9f285979
parent 680d3981b289233b9ff3d60683e99880dc90559c

Use tiles for bookmarks

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

Change-Id: If959cb0b8f110035b8dd2fefe8106e9c5d30f4f1

res/xml/site_specific_preferences.xml

diff --git a/res/xml/site_specific_preferences.xml b/res/xml/site_specific_preferences.xml
index 19aac5c..63e03b0 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"