diff options
| author | John Reck <jreck@google.com> | 2011-09-28 15:02:24 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-09-28 15:09:20 -0700 |
| commit | 23c61dd30cd2f4a96ab2b01a5878badc79380c6a (patch) | |
| tree | 846d61973a8b8540d9acfb3652d62e9186df653e /src | |
| parent | d8a64f0017da5d98ca9e6ca8b0b484c794061733 (diff) | |
| download | packages_apps_Browser-23c61dd30cd2f4a96ab2b01a5878badc79380c6a.tar.gz packages_apps_Browser-23c61dd30cd2f4a96ab2b01a5878badc79380c6a.tar.bz2 packages_apps_Browser-23c61dd30cd2f4a96ab2b01a5878badc79380c6a.zip | |
Update folder asset usage
Bug: 5066431
Change-Id: Icc4ea38e64881d0f67d3cbbd0b6bda7138f4a0b4
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/BrowserBookmarksAdapter.java | 3 | ||||
| -rw-r--r-- | src/com/android/browser/widget/BookmarkThumbnailWidgetService.java | 13 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/com/android/browser/BrowserBookmarksAdapter.java b/src/com/android/browser/BrowserBookmarksAdapter.java index b3f8d9858..2fd880c09 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/widget/BookmarkThumbnailWidgetService.java b/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java index 586f46d46..209faadf7 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 |