More widget tweaks
Change-Id: I9233bbc2df9a88a4979d065b17b0a3943500c7cd
diff --git a/res/layout/bookmarkthumbnailwidget.xml b/res/layout/bookmarkthumbnailwidget.xml
index 2c94d32..e312a2a 100644
--- a/res/layout/bookmarkthumbnailwidget.xml
+++ b/res/layout/bookmarkthumbnailwidget.xml
@@ -13,50 +13,39 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<FrameLayout
+<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="4dip"
- android:paddingBottom="22dip"
- android:paddingLeft="13dip"
- android:paddingRight="13dip">
- <LinearLayout
+ android:paddingBottom="20dip"
+ android:paddingLeft="12dip"
+ android:paddingRight="12dip">
+ <GridView
+ android:id="@+id/bookmarks_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- 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:visibility="invisible" />
- <GridView
- android:id="@+id/bookmarks_list"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:layout_marginLeft="5dip"
- android:layout_marginRight="5dip"
- android:numColumns="2"
- 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: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:visibility="invisible" />
- </LinearLayout>
-</FrameLayout>
+ android:numColumns="2"
+ android:paddingBottom="6dip"
+ android:paddingRight="3dip"
+ android:paddingLeft="3dip"
+ android:stretchMode="columnWidth"
+ android:horizontalSpacing="@dimen/widgetHorizontalSpacing"
+ android:verticalSpacing="@dimen/widgetVerticalSpacing"
+ android:drawSelectorOnTop="true"
+ android:listSelector="@drawable/bookmark_widget_thumb_selector"
+ android:fadingEdgeLength="24dp" />
+
+ <ImageButton
+ android:id="@+id/app_shortcut"
+ android:layout_width="56dip"
+ android:layout_height="56dip"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentRight="true"
+ android:layout_marginRight="4dip"
+ android:layout_marginBottom="6dip"
+ android:scaleType="centerInside"
+ android:src="@mipmap/ic_launcher_browser"
+ android:background="@drawable/bookmark_widget_thumb_selector"
+ android:padding="4dip" />
+</RelativeLayout>
diff --git a/res/values-xlarge-port/dimensions.xml b/res/values-xlarge-port/dimensions.xml
index 46e7272..e6b59ce 100644
--- a/res/values-xlarge-port/dimensions.xml
+++ b/res/values-xlarge-port/dimensions.xml
@@ -11,7 +11,7 @@
License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <dimen name="widgetThumbnailHeight">72dip</dimen>
- <dimen name="widgetHorizontalSpacing">0dip</dimen>
- <dimen name="widgetVerticalSpacing">4dip</dimen>
+ <dimen name="widgetThumbnailHeight">84dip</dimen>
+ <dimen name="widgetHorizontalSpacing">10dip</dimen>
+ <dimen name="widgetVerticalSpacing">10dip</dimen>
</resources>
diff --git a/res/values-xlarge/dimensions.xml b/res/values-xlarge/dimensions.xml
index d56146b..6aa83d2 100644
--- a/res/values-xlarge/dimensions.xml
+++ b/res/values-xlarge/dimensions.xml
@@ -13,8 +13,8 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<dimen name="bookmarkThumbnailWidth">180dip</dimen>
<dimen name="bookmarkThumbnailHeight">120dip</dimen>
- <dimen name="widgetThumbnailHeight">100dip</dimen>
- <dimen name="widgetHorizontalSpacing">12dip</dimen>
+ <dimen name="widgetThumbnailHeight">104dip</dimen>
+ <dimen name="widgetHorizontalSpacing">14dip</dimen>
<dimen name="widgetVerticalSpacing">12dip</dimen>
<dimen name="favicon_padded_size">24dip</dimen>
<!-- For the most visited page -->
diff --git a/src/com/android/browser/widget/BookmarkThumbnailWidgetProvider.java b/src/com/android/browser/widget/BookmarkThumbnailWidgetProvider.java
index 14e1c89..db52130 100644
--- a/src/com/android/browser/widget/BookmarkThumbnailWidgetProvider.java
+++ b/src/com/android/browser/widget/BookmarkThumbnailWidgetProvider.java
@@ -16,6 +16,7 @@
package com.android.browser.widget;
+import com.android.browser.BrowserActivity;
import com.android.browser.R;
import android.app.PendingIntent;
@@ -78,12 +79,16 @@
private void performUpdate(Context context,
AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+ Intent launchBrowser = new Intent(BrowserActivity.ACTION_SHOW_BROWSER,
+ null, context, BrowserActivity.class);
for (int appWidgetId : appWidgetIds) {
Intent updateIntent = new Intent(context, BookmarkThumbnailWidgetService.class);
updateIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
updateIntent.setData(Uri.parse(updateIntent.toUri(Intent.URI_INTENT_SCHEME)));
RemoteViews views = new RemoteViews(context.getPackageName(),
R.layout.bookmarkthumbnailwidget);
+ views.setOnClickPendingIntent(R.id.app_shortcut, PendingIntent
+ .getActivity(context, 0, launchBrowser, PendingIntent.FLAG_CANCEL_CURRENT));
views.setRemoteAdapter(R.id.bookmarks_list, updateIntent);
appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetId, R.id.bookmarks_list);
Intent ic = new Intent(context, BookmarkThumbnailWidgetService.class);