Makes items in the bookmark widget larger
Bug: 3185756
This change enforces a minimum height of 48dp for each item in
the bookmark list widget. It also adds the line seperator.
Change-Id: I2f582bac36e35095a17523a11c58f6cc029318f1
diff --git a/res/layout/bookmarklistwidget.xml b/res/layout/bookmarklistwidget.xml
index ffaa0c3..983854c 100644
--- a/res/layout/bookmarklistwidget.xml
+++ b/res/layout/bookmarklistwidget.xml
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="#00000000"
+ android:background="@null"
android:focusable="true"
android:clickable="true">
<LinearLayout
@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="8dip"
- android:background="#383847">
+ android:background="@color/bookmarkWidgetHeader">
<ImageView
android:id="@+id/logo"
android:layout_width="32dp"
@@ -40,15 +40,14 @@
android:layout_gravity="center_vertical"
android:text="@string/tab_bookmarks"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="@color/white"
android:paddingLeft="8dip" />
</LinearLayout>
<ListView
android:id="@+id/bookmarks_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#2b2b3c"
- android:cacheColorHint="#2b2b3c"
- android:dividerHeight="0dp"
- android:divider="#00000000" />
+ android:background="@color/bookmarkWidgetItemBackground"
+ android:cacheColorHint="@color/bookmarkWidgetItemBackground"
+ android:dividerHeight="1px"
+ android:divider="@color/bookmarkWidgetDivider" />
</LinearLayout>
diff --git a/res/layout/bookmarklistwidget_item.xml b/res/layout/bookmarklistwidget_item.xml
index 2257a26..9e41d39 100644
--- a/res/layout/bookmarklistwidget_item.xml
+++ b/res/layout/bookmarklistwidget_item.xml
@@ -19,9 +19,10 @@
android:id="@+id/list_item"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:minHeight="@dimen/widgetItemMinHeight"
android:orientation="horizontal"
android:padding="8dip"
- android:background="#383847">
+ android:background="@color/bookmarkWidgetFolderBackground">
<ImageView
android:id="@+id/thumb"
android:src="@drawable/browser_thumbnail"
@@ -35,7 +36,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="@color/white"
android:paddingLeft="8dip"
android:maxLines="1"
android:scrollHorizontally="true"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 822c3b4..5a5d255 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -24,4 +24,9 @@
<color name="black">#ff000000</color>
<color name="geolocation_permissions_prompt_background">#ffdddddd</color>
+
+ <color name="bookmarkWidgetHeader">#383847</color>
+ <color name="bookmarkWidgetDivider">#383847</color>
+ <color name="bookmarkWidgetItemBackground">#2b2b3c</color>
+ <color name="bookmarkWidgetFolderBackground">#A0383847</color>
</resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index f550cf7..404b2ac 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -23,4 +23,5 @@
<dimen name="bookmarkThumbnailHeight">80dip</dimen>
<dimen name="add_bookmark_width">500dip</dimen>
<dimen name="folder_selector_height">300dip</dimen>
+ <dimen name="widgetItemMinHeight">48dip</dimen>
</resources>
diff --git a/src/com/android/browser/widget/BookmarkListWidgetService.java b/src/com/android/browser/widget/BookmarkListWidgetService.java
index 1120536..14b52b7 100644
--- a/src/com/android/browser/widget/BookmarkListWidgetService.java
+++ b/src/com/android/browser/widget/BookmarkListWidgetService.java
@@ -233,7 +233,7 @@
views.setDrawableParameters(R.id.list_item, true, 0, -1, null, -1);
if (res.mIsFolder) {
if (folder != null && res.mId == folder.mId) {
- views.setDrawableParameters(R.id.list_item, true, 140, -1, null, -1);
+ views.setDrawableParameters(R.id.list_item, true, 255, -1, null, -1);
views.setImageViewResource(R.id.thumb, R.drawable.ic_back_normal);
} else {
views.setImageViewResource(R.id.thumb, R.drawable.ic_folder);