summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/drawable-hdpi/ic_menu_overflow.pngbin549 -> 526 bytes
-rw-r--r--res/drawable-mdpi/ic_menu_overflow.pngbin538 -> 445 bytes
-rw-r--r--res/drawable-xhdpi/ic_menu_overflow.pngbin629 -> 554 bytes
-rw-r--r--res/layout/bookmarkthumbnailwidget_item_folder.xml60
-rw-r--r--src/com/android/browser/BrowserBookmarksAdapter.java3
-rw-r--r--src/com/android/browser/Controller.java10
-rw-r--r--src/com/android/browser/widget/BookmarkThumbnailWidgetService.java13
7 files changed, 81 insertions, 5 deletions
diff --git a/res/drawable-hdpi/ic_menu_overflow.png b/res/drawable-hdpi/ic_menu_overflow.png
index 6188968..a12aedf 100644
--- a/res/drawable-hdpi/ic_menu_overflow.png
+++ b/res/drawable-hdpi/ic_menu_overflow.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_overflow.png b/res/drawable-mdpi/ic_menu_overflow.png
index d571532..4a3bde3 100644
--- a/res/drawable-mdpi/ic_menu_overflow.png
+++ b/res/drawable-mdpi/ic_menu_overflow.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_overflow.png b/res/drawable-xhdpi/ic_menu_overflow.png
index 29bbc3d..715cff8 100644
--- a/res/drawable-xhdpi/ic_menu_overflow.png
+++ b/res/drawable-xhdpi/ic_menu_overflow.png
Binary files differ
diff --git a/res/layout/bookmarkthumbnailwidget_item_folder.xml b/res/layout/bookmarkthumbnailwidget_item_folder.xml
new file mode 100644
index 0000000..6044164
--- /dev/null
+++ b/res/layout/bookmarkthumbnailwidget_item_folder.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/list_item"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <ImageView
+ android:id="@+id/thumb"
+ android:src="@drawable/thumbnail_bookmarks_widget_no_bookmark_holo"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/widgetThumbnailHeight"
+ android:scaleType="fitEnd"
+ android:cropToPadding="true"
+ android:background="@drawable/border_thumb_bookmarks_widget_holo" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@id/thumb"
+ android:background="@drawable/overlay_url_bookmark_widget_holo"
+ android:layout_marginLeft="2dip"
+ android:layout_marginRight="2dip"
+ android:layout_marginBottom="2dip">
+ <ImageView
+ android:id="@+id/favicon"
+ android:src="@drawable/app_web_browser_sm"
+ android:layout_width="@dimen/favicon_size"
+ android:layout_height="@dimen/favicon_size"
+ android:layout_gravity="center_vertical"
+ android:layout_marginLeft="4dip"
+ android:layout_marginRight="8dip"
+ android:layout_marginTop="4dip"
+ android:layout_marginBottom="4dip"
+ android:scaleType="centerInside" />
+ <TextView
+ android:id="@+id/label"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:textSize="12sp"
+ android:typeface="sans"
+ android:textColor="@android:color/white" />
+ </LinearLayout>
+</RelativeLayout>
diff --git a/src/com/android/browser/BrowserBookmarksAdapter.java b/src/com/android/browser/BrowserBookmarksAdapter.java
index b3f8d98..2fd880c 100644
--- a/src/com/android/browser/BrowserBookmarksAdapter.java
+++ b/src/com/android/browser/BrowserBookmarksAdapter.java
@@ -25,6 +25,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.CursorAdapter;
import android.widget.ImageView;
+import android.widget.ImageView.ScaleType;
import android.widget.TextView;
public class BrowserBookmarksAdapter extends CursorAdapter {
@@ -65,6 +66,7 @@ public class BrowserBookmarksAdapter extends CursorAdapter {
if (cursor.getInt(BookmarksLoader.COLUMN_INDEX_IS_FOLDER) != 0) {
// folder
thumb.setImageResource(R.drawable.thumb_bookmark_widget_folder_holo);
+ thumb.setScaleType(ScaleType.FIT_END);
thumb.setBackgroundDrawable(null);
} else {
byte[] thumbData = cursor.getBlob(BookmarksLoader.COLUMN_INDEX_THUMBNAIL);
@@ -73,6 +75,7 @@ public class BrowserBookmarksAdapter extends CursorAdapter {
thumbBitmap = BitmapFactory.decodeByteArray(thumbData, 0, thumbData.length);
}
+ thumb.setScaleType(ScaleType.CENTER_CROP);
if (thumbBitmap == null) {
thumb.setImageResource(R.drawable.browser_thumbnail);
} else {
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index aa7ecd9..78d0077 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1384,8 +1384,14 @@ public class Controller
if (type == WebView.HitTestResult.IMAGE_TYPE) {
menu.setHeaderTitle(extra);
}
- menu.findItem(R.id.view_image_context_menu_id).setIntent(
- new Intent(Intent.ACTION_VIEW, Uri.parse(extra)));
+ menu.findItem(R.id.view_image_context_menu_id)
+ .setOnMenuItemClickListener(new OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ openTab(extra, mTabControl.getCurrentTab(), true, true);
+ return false;
+ }
+ });
menu.findItem(R.id.download_context_menu_id).
setOnMenuItemClickListener(
new Download(mActivity, extra, webview.isPrivateBrowsingEnabled()));
diff --git a/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java b/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java
index 586f46d..209faad 100644
--- a/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java
+++ b/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java
@@ -223,8 +223,15 @@ public class BookmarkThumbnailWidgetService extends RemoteViewsService {
String url = mBookmarks.getString(BOOKMARK_INDEX_URL);
boolean isFolder = mBookmarks.getInt(BOOKMARK_INDEX_IS_FOLDER) != 0;
- RemoteViews views = new RemoteViews(
- mContext.getPackageName(), R.layout.bookmarkthumbnailwidget_item);
+ RemoteViews views;
+ // Two layouts are needed because of b/5387153
+ if (isFolder) {
+ views = new RemoteViews(mContext.getPackageName(),
+ R.layout.bookmarkthumbnailwidget_item_folder);
+ } else {
+ views = new RemoteViews(mContext.getPackageName(),
+ R.layout.bookmarkthumbnailwidget_item);
+ }
// Set the title of the bookmark. Use the url as a backup.
String displayTitle = title;
if (TextUtils.isEmpty(displayTitle)) {
@@ -286,7 +293,7 @@ public class BookmarkThumbnailWidgetService extends RemoteViewsService {
@Override
public int getViewTypeCount() {
- return 1;
+ return 2;
}
@Override
generated by cgit v1.1 at 2025-01-12 10:30:53 +0000