gello: cleanup resources
fix npe on tablets too
Change-Id: I1ea17887672813b2de72a05f63c6c4f695605459
Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
diff --git a/res/layout/bookmarkthumbnailwidget.xml b/res/layout/bookmarkthumbnailwidget.xml
index e9e377d..8cecd98 100644
--- a/res/layout/bookmarkthumbnailwidget.xml
+++ b/res/layout/bookmarkthumbnailwidget.xml
@@ -28,7 +28,7 @@
android:verticalSpacing="@dimen/widgetVerticalSpacing"
android:drawSelectorOnTop="true"
android:listSelector="@drawable/bookmark_widget_thumb_selector"
- android:background="@drawable/bg_bookmarks_widget_holo" />
+ android:background="@color/white" />
<ImageButton
android:id="@+id/app_shortcut"
diff --git a/res/layout/bookmarkthumbnailwidget_item.xml b/res/layout/bookmarkthumbnailwidget_item.xml
index cc30557..755153b 100644
--- a/res/layout/bookmarkthumbnailwidget_item.xml
+++ b/res/layout/bookmarkthumbnailwidget_item.xml
@@ -21,17 +21,16 @@
android:layout_height="wrap_content">
<ImageView
android:id="@+id/thumb"
- android:src="@drawable/thumbnail_bookmarks_widget_no_bookmark_holo"
+ android:src="@color/white"
android:layout_width="match_parent"
android:layout_height="@dimen/widgetThumbnailHeight"
android:scaleType="centerCrop"
android:cropToPadding="true"
- android:background="@drawable/border_thumb_bookmarks_widget_holo" />
+ android:background="@color/white" />
<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_marginStart="2dip"
android:layout_marginEnd="2dip"
android:layout_marginBottom="2dip">
diff --git a/res/layout/bookmarkthumbnailwidget_item_folder.xml b/res/layout/bookmarkthumbnailwidget_item_folder.xml
index 300890a..2d3f453 100644
--- a/res/layout/bookmarkthumbnailwidget_item_folder.xml
+++ b/res/layout/bookmarkthumbnailwidget_item_folder.xml
@@ -21,17 +21,16 @@
android:layout_height="wrap_content">
<ImageView
android:id="@+id/thumb"
- android:src="@drawable/thumbnail_bookmarks_widget_no_bookmark_holo"
+ android:src="@color/white"
android:layout_width="match_parent"
android:layout_height="@dimen/widgetThumbnailHeight"
android:scaleType="fitEnd"
android:cropToPadding="true"
- android:background="@drawable/border_thumb_bookmarks_widget_holo" />
+ android:background="@color/white" />
<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_marginStart="2dip"
android:layout_marginEnd="2dip"
android:layout_marginBottom="2dip">
diff --git a/res/layout/snapshot_item.xml b/res/layout/snapshot_item.xml
index c3ce866..7fc1782 100644
--- a/res/layout/snapshot_item.xml
+++ b/res/layout/snapshot_item.xml
@@ -21,12 +21,12 @@
android:padding="@dimen/combo_snapshot_item_padding">
<ImageView
android:id="@+id/thumb"
- android:src="@drawable/thumbnail_bookmarks_widget_no_bookmark_holo"
+ android:src="@color/white"
android:layout_width="@dimen/bookmarkThumbnailWidth"
android:layout_height="@dimen/bookmarkThumbnailHeight"
android:scaleType="centerCrop"
android:cropToPadding="true"
- android:background="@drawable/border_thumb_bookmarks_widget_holo" />
+ android:background="@color/white" />
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
@@ -34,7 +34,6 @@
android:layout_alignBottom="@id/thumb"
android:layout_alignStart="@id/thumb"
android:layout_alignEnd="@id/thumb"
- android:background="@drawable/overlay_url_bookmark_widget_holo"
android:singleLine="true"
android:ellipsize="end"
android:textSize="14sp"
diff --git a/res/layout/tab_bar.xml b/res/layout/tab_bar.xml
index bbb22a5..09c9673 100644
--- a/res/layout/tab_bar.xml
+++ b/res/layout/tab_bar.xml
@@ -28,5 +28,5 @@
style="@style/NavButton"
android:layout_width="wrap_content"
android:background="@drawable/add_tab_selector"
- android:src="@drawable/ic_menu_new_window" />
+ android:src="@drawable/ic_action_add_tab" />
</merge>