Merge "Thumbnail widget tweaks" into honeycomb
diff --git a/res/drawable-mdpi/header_row_focused_bookmark_widget_holo.9.png b/res/drawable-mdpi/header_row_focused_bookmark_widget_holo.9.png
new file mode 100644
index 0000000..b745159
--- /dev/null
+++ b/res/drawable-mdpi/header_row_focused_bookmark_widget_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/header_row_press_bookmark_widget_holo.9.png b/res/drawable-mdpi/header_row_press_bookmark_widget_holo.9.png
new file mode 100644
index 0000000..2e8874e
--- /dev/null
+++ b/res/drawable-mdpi/header_row_press_bookmark_widget_holo.9.png
Binary files differ
diff --git a/res/drawable/widget_background.xml b/res/drawable/widget_background.xml
index 15f8a59..4c59d60 100644
--- a/res/drawable/widget_background.xml
+++ b/res/drawable/widget_background.xml
@@ -19,13 +19,5 @@
<item
android:drawable="@drawable/bg_bookmark_widget_holo">
</item>
- <item>
- <bitmap
- android:src="@drawable/stripes_overlay_bg_bookmark_widget_holo"
- android:gravity="top|left|clip_vertical|clip_horizontal"
- android:left="3dip"
- android:right="3dip"
- android:top="3dip"
- android:bottom="3dip" />
- </item>
+
</layer-list>
diff --git a/res/layout/bookmarkthumbnailwidget.xml b/res/layout/bookmarkthumbnailwidget.xml
index 581db5c..2c94d32 100644
--- a/res/layout/bookmarkthumbnailwidget.xml
+++ b/res/layout/bookmarkthumbnailwidget.xml
@@ -25,14 +25,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:padding="0dip"
- android:background="@drawable/widget_background">
+ android:padding="0dip">
<ImageView android:background="@drawable/list_div_top_btm_bookmark_widget_holo"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginTop="2dip"
android:layout_marginLeft="1dip"
- android:layout_marginRight="1dip" />
+ android:layout_marginRight="1dip"
+ android:visibility="invisible" />
<GridView
android:id="@+id/bookmarks_list"
android:layout_width="match_parent"
@@ -41,17 +41,22 @@
android:layout_marginLeft="5dip"
android:layout_marginRight="5dip"
android:numColumns="2"
- android:padding="1dip"
+ android:paddingTop="1dip"
+ android:paddingBottom="1dip"
+ android:paddingRight="0dip"
+ android:paddingLeft="0dip"
android:stretchMode="columnWidth"
android:horizontalSpacing="@dimen/widgetHorizontalSpacing"
android:verticalSpacing="@dimen/widgetVerticalSpacing"
android:drawSelectorOnTop="true"
- android:listSelector="@drawable/bookmark_widget_thumb_selector" />
+ android:listSelector="@drawable/bookmark_widget_thumb_selector"
+ android:fadingEdgeLength="24dp" />
<ImageView android:background="@drawable/list_div_top_btm_bookmark_widget_holo"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginBottom="3dip"
android:layout_marginLeft="1dip"
- android:layout_marginRight="1dip" />
+ android:layout_marginRight="1dip"
+ android:visibility="invisible" />
</LinearLayout>
</FrameLayout>
diff --git a/res/values-xlarge/dimensions.xml b/res/values-xlarge/dimensions.xml
index 43e1035..d56146b 100644
--- a/res/values-xlarge/dimensions.xml
+++ b/res/values-xlarge/dimensions.xml
@@ -13,9 +13,9 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<dimen name="bookmarkThumbnailWidth">180dip</dimen>
<dimen name="bookmarkThumbnailHeight">120dip</dimen>
- <dimen name="widgetThumbnailHeight">90dip</dimen>
- <dimen name="widgetHorizontalSpacing">8dip</dimen>
- <dimen name="widgetVerticalSpacing">8dip</dimen>
+ <dimen name="widgetThumbnailHeight">100dip</dimen>
+ <dimen name="widgetHorizontalSpacing">12dip</dimen>
+ <dimen name="widgetVerticalSpacing">12dip</dimen>
<dimen name="favicon_padded_size">24dip</dimen>
<!-- For the most visited page -->
<dimen name="mv_max_width">1010dp</dimen>
diff --git a/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java b/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java
index fcd2103..51ba2ca 100644
--- a/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java
+++ b/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java
@@ -252,7 +252,9 @@
views.setImageViewResource(R.id.thumb, R.drawable.thumb_bookmark_widget_folder_holo);
}
views.setImageViewResource(R.id.favicon, R.drawable.ic_bookmark_widget_bookmark_holo_dark);
+ views.setDrawableParameters(R.id.thumb, true, 0, -1, null, -1);
} else {
+ views.setDrawableParameters(R.id.thumb, true, 255, -1, null, -1);
if (res.mThumbnail != null) {
views.setImageViewBitmap(R.id.thumb, res.mThumbnail);
} else {