Use tiles for bookmarks
- Use tile based bitmap for bookmarks and history
- Settings UI cleanup
Change-Id: If959cb0b8f110035b8dd2fefe8106e9c5d30f4f1
diff --git a/src/com/android/browser/BrowserBookmarksAdapter.java b/src/com/android/browser/BrowserBookmarksAdapter.java
index 38e07e0..cef6e62 100644
--- a/src/com/android/browser/BrowserBookmarksAdapter.java
+++ b/src/com/android/browser/BrowserBookmarksAdapter.java
@@ -24,6 +24,7 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.ImageView;
import android.widget.TextView;
import com.android.browser.mdm.EditBookmarksRestriction;
@@ -85,7 +86,7 @@
.getDimensionPixelSize(R.dimen.combo_horizontalSpacing);
view.setPadding(padding, view.getPaddingTop(),
padding, view.getPaddingBottom());
- BookmarkThumbImageView thumb = (BookmarkThumbImageView) view.findViewById(R.id.thumb_image);
+ SiteTileView thumb = (SiteTileView) view.findViewById(R.id.thumb_image);
TextView tv = (TextView) view.findViewById(R.id.label);
tv.setText(item.title);
int containerWidth = thumb.getWidth() - thumb.getPaddingLeft() - thumb.getPaddingRight();
@@ -94,7 +95,8 @@
if (item.is_folder) {
b = BitmapFactory.decodeResource(mContext.getResources(),
- R.drawable.thumb_bookmark_widget_folder_holo);
+ R.drawable.ic_deco_folder_normal);
+ thumb.setFloating(true);
}
else if (item.thumbnail == null || !item.has_thumbnail) {
b = BitmapFactory.decodeResource(mContext.getResources(),
@@ -105,7 +107,8 @@
}
// If the item is managed by mdm or edit bookmark restriction enabled
- if (containerWidth != 0 && (item.is_mdm_managed || EditBookmarksRestriction.getInstance().isEnabled())) {
+ if (containerWidth != 0 && (item.is_mdm_managed ||
+ EditBookmarksRestriction.getInstance().isEnabled())) {
int iconResId;
float overlayScale, overlayVertPos;
@@ -122,11 +125,12 @@
float willScale = (float) containerWidth / (float) b.getWidth();
Bitmap bm = BrowserBookmarksPage.overlayBookmarkBitmap(b, iconResId, mContext,
overlayScale / willScale, (int) (overlayVertPos / willScale));
- thumb.setImageBitmap(bm);
+ thumb.replaceFavicon(bm);
}
else {
- thumb.setImageBitmap(b);
+ thumb.replaceFavicon(b);
}
+ thumb.setLongClickable(true);
}
@Override