Use tiles for bookmarks
- Use tile based bitmap for bookmarks and history
- Settings UI cleanup
Change-Id: If959cb0b8f110035b8dd2fefe8106e9c5d30f4f1
diff --git a/res/layout/bookmark_thumbnail.xml b/res/layout/bookmark_thumbnail.xml
index df9e853..8913551 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"
- >
+ android:paddingEnd="@dimen/combo_horizontalSpacing"
+ android:paddingStart="@dimen/combo_horizontalSpacing" >
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ <com.android.browser.SiteTileView
+ android:id="@+id/thumb_image"
+ android:layout_width="@dimen/bookmarkThumbnailWidth"
+ android:layout_height="@dimen/bookmarkThumbnailHeight" />
- <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>
-
+ <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 d4238f5..7eee4e9 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 1636fe6..c244423 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 cd236d5..332dc36 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 31560df..700d0c2 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 0115356..c3ce866 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 30d4ca4..d01809e 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 9dca94d..44eb1de 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"