Merge "Widget update"
diff --git a/res/layout/bookmarkthumbnailwidget.xml b/res/layout/bookmarkthumbnailwidget.xml
index 967e4c1..0bff98e 100644
--- a/res/layout/bookmarkthumbnailwidget.xml
+++ b/res/layout/bookmarkthumbnailwidget.xml
@@ -16,38 +16,28 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingTop="0dip"
- android:paddingBottom="3dip"
- android:paddingLeft="0dip"
- android:paddingRight="0dip">
+ android:layout_height="match_parent">
<GridView
android:id="@+id/bookmarks_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:numColumns="auto_fit"
android:columnWidth="@dimen/widgetColumnWidth"
- android:paddingTop="6dip"
- android:paddingRight="7dip"
- android:paddingLeft="7dip"
android:stretchMode="columnWidth"
android:horizontalSpacing="@dimen/widgetHorizontalSpacing"
android:verticalSpacing="@dimen/widgetVerticalSpacing"
android:drawSelectorOnTop="true"
android:listSelector="@drawable/bookmark_widget_thumb_selector"
- android:fadingEdgeLength="24dp"
- android:scrollbarStyle="outsideOverlay"
android:background="@drawable/bg_bookmarks_widget_holo" />
<ImageButton
android:id="@+id/app_shortcut"
- android:layout_width="56dip"
- android:layout_height="56dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_marginRight="4dip"
- android:layout_marginBottom="6dip"
- android:scaleType="centerInside"
+ android:layout_marginBottom="4dip"
android:src="@mipmap/ic_launcher_browser"
android:background="@drawable/bookmark_widget_thumb_selector"
android:padding="4dip" />
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 3a25e4e..5652451 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -50,7 +50,7 @@
<dimen name="widgetThumbnailHeight">94dip</dimen>
<dimen name="widgetHorizontalSpacing">6dip</dimen>
<dimen name="widgetVerticalSpacing">6dip</dimen>
- <dimen name="widgetColumnWidth">90dip</dimen>
+ <dimen name="widgetColumnWidth">80dip</dimen>
<!-- For the combined Bookmarks History view -->
<dimen name="combo_paddingTop">0dip</dimen>
<dimen name="combo_horizontalSpacing">6dip</dimen>
diff --git a/res/xml-sw600dp/bookmarkthumbnailwidget_info.xml b/res/xml-sw600dp/bookmarkthumbnailwidget_info.xml
index 99afda7..7fdcbef 100644
--- a/res/xml-sw600dp/bookmarkthumbnailwidget_info.xml
+++ b/res/xml-sw600dp/bookmarkthumbnailwidget_info.xml
@@ -17,10 +17,10 @@
<!-- 3x3 Widget displaying the user's bookmarks as a list with favicons. -->
<appwidget-provider
xmlns:android="http://schemas.android.com/apk/res/android"
- android:minWidth="219dip"
- android:minHeight="219dip"
- android:minResizeHeight="72dip"
- android:minResizeWidth="146dip"
+ android:minWidth="180dip"
+ android:minHeight="180dip"
+ android:minResizeHeight="40dip"
+ android:minResizeWidth="110dip"
android:updatePeriodMillis="0"
android:previewImage="@drawable/browser_widget_preview"
android:initialLayout="@layout/bookmarkthumbnailwidget"
diff --git a/res/xml/bookmarkthumbnailwidget_info.xml b/res/xml/bookmarkthumbnailwidget_info.xml
index bf2e612..f8ca797 100644
--- a/res/xml/bookmarkthumbnailwidget_info.xml
+++ b/res/xml/bookmarkthumbnailwidget_info.xml
@@ -17,10 +17,10 @@
<!-- 3x2 Widget displaying the user's bookmarks as a list with favicons. -->
<appwidget-provider
xmlns:android="http://schemas.android.com/apk/res/android"
- android:minWidth="219dip"
- android:minHeight="146dip"
- android:minResizeHeight="72dip"
- android:minResizeWidth="146dip"
+ android:minWidth="180dip"
+ android:minHeight="110dip"
+ android:minResizeHeight="40dip"
+ android:minResizeWidth="110dip"
android:updatePeriodMillis="0"
android:previewImage="@drawable/browser_widget_preview"
android:initialLayout="@layout/bookmarkthumbnailwidget"