Multiple fixes for Favicons

- Per Site Settings now uses SiteTiles and shows favicons
- New default Favicon
- Fixed missing Favicons on History items

Change-Id: Ia0317694ede81d62ce04e0693f9779f65030165c

3 files changed, 39 insertions, 28 deletions

diff --git a/res/drawable-xxhdpi/ic_deco_favicon_normal.png b/res/drawable-xxhdpi/ic_deco_favicon_normal.png
index 5e38c971..ac3b2a46 100644
--- a/res/drawable-xxhdpi/ic_deco_favicon_normal.png
+++ b/res/drawable-xxhdpi/ic_deco_favicon_normal.png
diff --git a/res/layout/swe_website_settings.xml b/res/layout/swe_website_settings.xml
index 50d593c1..b71d4cc0 100644
--- a/res/layout/swe_website_settings.xml
+++ b/res/layout/swe_website_settings.xml
@@ -23,34 +23,47 @@
     android:layout_width="match_parent"
     android:background="@android:color/transparent">
 
-    <ListView android:id="@android:id/list"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="0px"
-        android:layout_weight="1"
-        android:clipToPadding="false"
-        android:drawSelectorOnTop="false"
-        android:cacheColorHint="@android:color/transparent"
-        android:divider="@null"
-        android:dividerHeight="0dp"
-        android:scrollbarAlwaysDrawVerticalTrack="true" />
+        android:layout_height="fill_parent"
+        android:layout_weight="1">
+        <ListView android:id="@android:id/list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:drawSelectorOnTop="false"
+            android:cacheColorHint="@android:color/transparent"
+            android:divider="@null"
+            android:dividerHeight="0dp"
+            android:scrollbarAlwaysDrawVerticalTrack="true" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/combo_shadow_height"
+            android:layout_gravity="bottom"
+            android:background="@drawable/shadow_top" />
+    </FrameLayout>
 
     <LinearLayout
-        android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:background="@color/primary"
+        style="?android:attr/buttonBarStyle" >
 
         <Button android:id="@+id/add_new_site"
-                android:layout_width="150dip"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dip"
-                android:text="@string/website_settings_add_origin"
-                android:visibility="gone" />
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/website_settings_add_origin"
+            style="?android:attr/buttonBarButtonStyle"
+            />
 
         <Button android:id="@+id/clear_all_button"
-            android:layout_width="150dip"
             android:layout_height="wrap_content"
-            android:layout_margin="5dip"
+            android:layout_width="wrap_content"
+            android:layout_weight="1"
             android:text="@string/website_settings_clear_all"
-            android:visibility="gone" />
+            style="?android:attr/buttonBarButtonStyle"
+             />
     </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/website_settings_row.xml b/res/layout/website_settings_row.xml
index 68c38d9c..32d53c80 100644
--- a/res/layout/website_settings_row.xml
+++ b/res/layout/website_settings_row.xml
@@ -21,15 +21,13 @@
   android:gravity="center_vertical"
   android:padding="0dip">
 
-  <ImageView android:id="@+id/icon"
-    android:layout_width="20dip"
-    android:layout_height="20dip"
-    android:layout_marginStart="18dip"
-    android:layout_marginEnd="18dip"
-    android:layout_centerVertical="true"
-    android:background="@drawable/bookmark_list_favicon_bg"
-    android:padding="2dip" />
-
+    <com.android.browser.SiteTileView
+        android:id="@+id/icon"
+        android:layout_centerVertical="true"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_marginStart="6dip"
+        android:layout_marginEnd="6dip"/>
   <LinearLayout
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"