Removed extra bitmap captures
- Removed unncessary calls to capture bitmaps
- Streamlined the code
Change-Id: I4701e72dd44685dc867c121da76fd0ec0ade0be7
diff --git a/res/layout/bookmark_thumbnail.xml b/res/layout/bookmark_thumbnail.xml
index 8b05b3b..df9e853 100644
--- a/res/layout/bookmark_thumbnail.xml
+++ b/res/layout/bookmark_thumbnail.xml
@@ -25,26 +25,39 @@
android:orientation="vertical"
>
- <com.android.browser.view.BookmarkThumbImageView
- android:id="@+id/thumb_image"
- android:layout_width="@dimen/bookmarkThumbnailWidth"
- android:layout_height="@dimen/bookmarkThumbnailHeight"
- android:paddingTop="2dip"
- android:scaleType="centerCrop"
- android:src="@drawable/browser_thumbnail"
- />
-
- <TextView
- android:id="@+id/label"
+ <FrameLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ellipsize="marquee"
- android:paddingStart="8dip"
- android:paddingEnd="4dip"
- android:paddingTop="2dip"
- android:paddingBottom="2dip"
- android:singleLine="true"
- android:textAppearance="@style/BookmarkText"
- />
+ android:layout_height="match_parent">
+
+ <com.android.browser.view.BookmarkThumbImageView
+ android:id="@+id/thumb_image"
+ android:layout_width="@dimen/bookmarkThumbnailWidth"
+ android:layout_height="@dimen/bookmarkThumbnailHeight"
+ android:paddingTop="2dip"
+ android:scaleType="centerCrop"
+ android:src="@drawable/browser_thumbnail"
+ />
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:background="@color/bookmarkWidgetFolderBackground"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/label"
+ android:layout_width="@dimen/bookmarkThumbnailWidth"
+ android:layout_height="wrap_content"
+ android:ellipsize="marquee"
+ android:paddingStart="8dip"
+ android:paddingEnd="4dip"
+ android:paddingTop="2dip"
+ android:paddingBottom="2dip"
+ android:singleLine="true"
+ android:textAppearance="@style/BookmarkText"
+ />
+ </LinearLayout>
+ </FrameLayout>
</com.android.browser.view.BookmarkContainer>
diff --git a/res/values-sw600dp/dimensions.xml b/res/values-sw600dp/dimensions.xml
index 8e6bf31..b7c2e63 100644
--- a/res/values-sw600dp/dimensions.xml
+++ b/res/values-sw600dp/dimensions.xml
@@ -11,8 +11,6 @@
License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <dimen name="bookmarkThumbnailWidth">180dip</dimen>
- <dimen name="bookmarkThumbnailHeight">90dip</dimen>
<dimen name="widgetThumbnailHeight">104dip</dimen>
<dimen name="widgetColumnWidth">130dip</dimen>
<dimen name="favicon_padded_size">28dip</dimen>
diff --git a/res/values-v17/styles.xml b/res/values-v17/styles.xml
index 899a15b..636ad93 100644
--- a/res/values-v17/styles.xml
+++ b/res/values-v17/styles.xml
@@ -66,7 +66,7 @@
<style name="BookmarkText">
<item name="android:textSize">16sp</item>
- <item name="android:textColor">@color/black</item>
+ <item name="android:textColor">@color/white</item>
<item name="android:fontFamily">sans-serif-light</item>
</style>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index cf6b60a..f0d59fb 100755
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -19,8 +19,8 @@
<dimen name="tab_slice">15.5dp</dimen>
<dimen name="tab_focus_stroke">2dip</dimen>
<dimen name="max_tab_width">300dp</dimen>
- <dimen name="bookmarkThumbnailWidth">130dip</dimen>
- <dimen name="bookmarkThumbnailHeight">65dip</dimen>
+ <dimen name="bookmarkThumbnailWidth">100dip</dimen>
+ <dimen name="bookmarkThumbnailHeight">100dip</dimen>
<!--Add for Navigation Feature -->
<dimen name="mynav_item_width">80px</dimen>
<dimen name="mynav_item_width_portrait">80px</dimen>