History UI update
Change-Id: If4af6e37252f297bc1744af65df4bc2f123f41dd
diff --git a/res/drawable/bookmark_list_favicon_bg.xml b/res/drawable/bookmark_list_favicon_bg.xml
index 3d362e4..ceb545d 100644
--- a/res/drawable/bookmark_list_favicon_bg.xml
+++ b/res/drawable/bookmark_list_favicon_bg.xml
@@ -18,9 +18,9 @@
android:shape="rectangle">
<solid android:color="@color/bookmarkListFaviconBackground" />
<padding
- android:left="5dip"
- android:right="5dip"
- android:top="5dip"
- android:bottom="5dip" />
- <corners android:radius="3dip" />
+ android:left="@dimen/list_favicon_padding"
+ android:right="@dimen/list_favicon_padding"
+ android:top="@dimen/list_favicon_padding"
+ android:bottom="@dimen/list_favicon_padding" />
+ <corners android:radius="@dimen/list_favicon_corner_radius" />
</shape>
diff --git a/res/drawable/btn_checkbox_star.xml b/res/drawable/btn_checkbox_star.xml
new file mode 100644
index 0000000..9635dad
--- /dev/null
+++ b/res/drawable/btn_checkbox_star.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_checked="true"
+ android:drawable="@drawable/ic_favorite_on_normal" />
+ <item android:state_checked="false"
+ android:drawable="@drawable/ic_favorite_off_normal" />
+</selector>
diff --git a/res/drawable/btn_star.xml b/res/drawable/btn_imageview_star.xml
similarity index 100%
rename from res/drawable/btn_star.xml
rename to res/drawable/btn_imageview_star.xml
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" />
diff --git a/res/menu/history.xml b/res/menu/history.xml
index 3bb30a0..f2ab299 100644
--- a/res/menu/history.xml
+++ b/res/menu/history.xml
@@ -18,4 +18,8 @@
<item android:id="@+id/clear_history_menu_id"
android:title="@string/clear_history"
android:icon="@android:drawable/ic_menu_close_clear_cancel" />
+ <item android:id="@+id/preferences_menu_id"
+ android:title="@string/menu_preferences"
+ android:icon="@drawable/ic_menu_settings"
+ android:alphabeticShortcut="p" />
</menu>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index b78b461..1e90c34 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -40,4 +40,6 @@
<dimen name="mv_border_width">3dp</dimen>
<dimen name="tab_padding_top">12dp</dimen>
<dimen name="tab_first_padding_left">12dp</dimen>
+ <dimen name="list_favicon_padding">5dip</dimen>
+ <dimen name="list_favicon_corner_radius">3dip</dimen>
</resources>