History UI update
Change-Id: If4af6e37252f297bc1744af65df4bc2f123f41dd
diff --git a/res/layout/bookmarks.xml b/res/layout/bookmarks.xml
index a4a4e04..81327e4 100644
--- a/res/layout/bookmarks.xml
+++ b/res/layout/bookmarks.xml
@@ -16,9 +16,13 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/bookmarks"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:paddingTop="@dimen/combo_paddingTop"
+ android:paddingLeft="@dimen/combo_paddingLeftRight"
+ android:paddingRight="@dimen/combo_paddingLeftRight">
<FrameLayout
android:id="@+id/header_container"
diff --git a/res/layout/bookmarks_history.xml b/res/layout/bookmarks_history.xml
index 9961d6f..5622917 100644
--- a/res/layout/bookmarks_history.xml
+++ b/res/layout/bookmarks_history.xml
@@ -18,7 +18,4 @@
android:id="@+id/fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingTop="@dimen/combo_paddingTop"
- android:paddingLeft="@dimen/combo_paddingLeftRight"
- android:paddingRight="@dimen/combo_paddingLeftRight"
android:background="@drawable/bg_browser" />
diff --git a/res/layout/history.xml b/res/layout/history.xml
index f6e844a..f7d2c7c 100644
--- a/res/layout/history.xml
+++ b/res/layout/history.xml
@@ -19,20 +19,19 @@
android:layout_height="match_parent"
>
- <ExpandableListView android:id="@android:id/list"
- android:layout_width="match_parent"
+ <ViewStub
+ android:id="@+id/pref_stub"
android:layout_height="match_parent"
- android:drawSelectorOnTop="false"
- />
+ android:layout_width="match_parent"
+ android:inflatedId="@+id/history" />
<TextView android:id="@android:id/empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
-
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/empty_history"
android:visibility="gone"
/>
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/res/layout/history_item.xml b/res/layout/history_item.xml
index a0b031a..3b3dd7a 100644
--- a/res/layout/history_item.xml
+++ b/res/layout/history_item.xml
@@ -19,22 +19,22 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
- android:paddingLeft="6dip"
- android:gravity="center_vertical"
+ android:paddingLeft="20dip"
>
<ImageView android:id="@+id/favicon"
- android:layout_width="20dip"
- android:layout_height="20dip"
- android:layout_marginLeft="5dip"
- android:layout_marginRight="11dip"
- android:padding="2dip"
- android:background="@drawable/fav_icn_background"
+ android:layout_width="32dip"
+ android:layout_height="32dip"
+ android:layout_gravity="center_vertical"
+ android:scaleType="fitXY"
+ android:background="@drawable/bookmark_list_favicon_bg"
android:src="@drawable/app_web_browser_sm"
/>
<LinearLayout android:layout_width="0dip"
android:layout_weight="1"
android:layout_height="wrap_content"
android:orientation="vertical"
+ android:paddingLeft="16dip"
+ android:layout_gravity="center_vertical"
>
<TextView android:id="@+id/title"
android:textAppearance="?android:attr/textAppearanceMedium"
@@ -55,9 +55,13 @@
</LinearLayout>
<CheckBox android:id="@+id/star"
android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:paddingRight="6dip"
+ android:layout_height="wrap_content"
+ android:paddingTop="16dip"
+ android:paddingBottom="16dip"
+ android:paddingRight="20dip"
+ android:paddingLeft="16dip"
android:focusable="false"
- android:button="@android:drawable/btn_star"
+ android:button="@drawable/btn_checkbox_star"
+ android:layout_gravity="center_vertical"
/>
</LinearLayout>
diff --git a/res/layout/url_bar.xml b/res/layout/url_bar.xml
index 884267e..c619e64 100644
--- a/res/layout/url_bar.xml
+++ b/res/layout/url_bar.xml
@@ -83,7 +83,7 @@
style="@style/Suggestions" />
<ImageView
android:id="@+id/star"
- android:src="@drawable/btn_star"
+ android:src="@drawable/btn_imageview_star"
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="@style/HoloButton" />