gello: cleanup resources
fix npe on tablets too
Change-Id: I1ea17887672813b2de72a05f63c6c4f695605459
Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
diff --git a/res/drawable-hdpi/bg_bookmarks_widget_holo.9.png b/res/drawable-hdpi/bg_bookmarks_widget_holo.9.png
deleted file mode 100644
index 7b8b0ff..0000000
--- a/res/drawable-hdpi/bg_bookmarks_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/bookmarks_widget_thumb_selector_focused.9.png b/res/drawable-hdpi/bookmarks_widget_thumb_selector_focused.9.png
deleted file mode 100644
index 54b63c9..0000000
--- a/res/drawable-hdpi/bookmarks_widget_thumb_selector_focused.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/bookmarks_widget_thumb_selector_longpressed.9.png b/res/drawable-hdpi/bookmarks_widget_thumb_selector_longpressed.9.png
deleted file mode 100644
index 3dd71fa..0000000
--- a/res/drawable-hdpi/bookmarks_widget_thumb_selector_longpressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/bookmarks_widget_thumb_selector_pressed.9.png b/res/drawable-hdpi/bookmarks_widget_thumb_selector_pressed.9.png
deleted file mode 100644
index 2442511..0000000
--- a/res/drawable-hdpi/bookmarks_widget_thumb_selector_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/browser_widget_preview.png b/res/drawable-hdpi/browser_widget_preview.png
deleted file mode 100644
index d25cf89..0000000
--- a/res/drawable-hdpi/browser_widget_preview.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/browsertab_add.png b/res/drawable-hdpi/browsertab_add.png
deleted file mode 100644
index 7401eed..0000000
--- a/res/drawable-hdpi/browsertab_add.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/browsertab_add_focused.png b/res/drawable-hdpi/browsertab_add_focused.png
deleted file mode 100644
index 2ebe44e..0000000
--- a/res/drawable-hdpi/browsertab_add_focused.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/default_video_poster.png b/res/drawable-hdpi/default_video_poster.png
deleted file mode 100644
index 8c1c94a..0000000
--- a/res/drawable-hdpi/default_video_poster.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_list_data_large.png b/res/drawable-hdpi/ic_list_data_large.png
deleted file mode 100644
index 105656d..0000000
--- a/res/drawable-hdpi/ic_list_data_large.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_list_data_off.png b/res/drawable-hdpi/ic_list_data_off.png
deleted file mode 100644
index d55b845..0000000
--- a/res/drawable-hdpi/ic_list_data_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_list_data_small.png b/res/drawable-hdpi/ic_list_data_small.png
deleted file mode 100644
index a8383f3..0000000
--- a/res/drawable-hdpi/ic_list_data_small.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_new_window.png b/res/drawable-hdpi/ic_menu_new_window.png
deleted file mode 100644
index ac9dbd6..0000000
--- a/res/drawable-hdpi/ic_menu_new_window.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/overlay_url_bookmark_widget_holo.9.png b/res/drawable-hdpi/overlay_url_bookmark_widget_holo.9.png
deleted file mode 100644
index aeb978d..0000000
--- a/res/drawable-hdpi/overlay_url_bookmark_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/thumbnail_bookmarks_widget_no_bookmark_holo.png b/res/drawable-hdpi/thumbnail_bookmarks_widget_no_bookmark_holo.png
deleted file mode 100644
index cc405a2..0000000
--- a/res/drawable-hdpi/thumbnail_bookmarks_widget_no_bookmark_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/bg_bookmarks_widget_holo.9.png b/res/drawable-mdpi/bg_bookmarks_widget_holo.9.png
deleted file mode 100644
index 7b8b0ff..0000000
--- a/res/drawable-mdpi/bg_bookmarks_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/bookmarks_widget_thumb_selector_focused.9.png b/res/drawable-mdpi/bookmarks_widget_thumb_selector_focused.9.png
deleted file mode 100644
index 3245acf..0000000
--- a/res/drawable-mdpi/bookmarks_widget_thumb_selector_focused.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/bookmarks_widget_thumb_selector_longpressed.9.png b/res/drawable-mdpi/bookmarks_widget_thumb_selector_longpressed.9.png
deleted file mode 100644
index d3ab2c2..0000000
--- a/res/drawable-mdpi/bookmarks_widget_thumb_selector_longpressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/bookmarks_widget_thumb_selector_pressed.9.png b/res/drawable-mdpi/bookmarks_widget_thumb_selector_pressed.9.png
deleted file mode 100644
index ec1f31a..0000000
--- a/res/drawable-mdpi/bookmarks_widget_thumb_selector_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/browser_widget_preview.png b/res/drawable-mdpi/browser_widget_preview.png
deleted file mode 100644
index 74ef056..0000000
--- a/res/drawable-mdpi/browser_widget_preview.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/browsertab_add.png b/res/drawable-mdpi/browsertab_add.png
deleted file mode 100644
index f960c1d..0000000
--- a/res/drawable-mdpi/browsertab_add.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/browsertab_add_focused.png b/res/drawable-mdpi/browsertab_add_focused.png
deleted file mode 100644
index cb595f3..0000000
--- a/res/drawable-mdpi/browsertab_add_focused.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/default_video_poster.png b/res/drawable-mdpi/default_video_poster.png
deleted file mode 100644
index 9e62fa9..0000000
--- a/res/drawable-mdpi/default_video_poster.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_list_data_large.png b/res/drawable-mdpi/ic_list_data_large.png
deleted file mode 100644
index be17f3b..0000000
--- a/res/drawable-mdpi/ic_list_data_large.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_list_data_off.png b/res/drawable-mdpi/ic_list_data_off.png
deleted file mode 100644
index d87a7bf..0000000
--- a/res/drawable-mdpi/ic_list_data_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_list_data_small.png b/res/drawable-mdpi/ic_list_data_small.png
deleted file mode 100644
index e2aa309..0000000
--- a/res/drawable-mdpi/ic_list_data_small.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_new_window.png b/res/drawable-mdpi/ic_menu_new_window.png
deleted file mode 100644
index 8b41251..0000000
--- a/res/drawable-mdpi/ic_menu_new_window.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/overlay_url_bookmark_widget_holo.9.png b/res/drawable-mdpi/overlay_url_bookmark_widget_holo.9.png
deleted file mode 100644
index 391b98d..0000000
--- a/res/drawable-mdpi/overlay_url_bookmark_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/thumbnail_bookmarks_widget_no_bookmark_holo.png b/res/drawable-mdpi/thumbnail_bookmarks_widget_no_bookmark_holo.png
deleted file mode 100644
index f31ad01..0000000
--- a/res/drawable-mdpi/thumbnail_bookmarks_widget_no_bookmark_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/bg_bookmarks_widget_holo.9.png b/res/drawable-xhdpi/bg_bookmarks_widget_holo.9.png
deleted file mode 100644
index 62b411e..0000000
--- a/res/drawable-xhdpi/bg_bookmarks_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/bookmarks_widget_thumb_selector_focused.9.png b/res/drawable-xhdpi/bookmarks_widget_thumb_selector_focused.9.png
deleted file mode 100644
index 6a1aa85..0000000
--- a/res/drawable-xhdpi/bookmarks_widget_thumb_selector_focused.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/bookmarks_widget_thumb_selector_longpressed.9.png b/res/drawable-xhdpi/bookmarks_widget_thumb_selector_longpressed.9.png
deleted file mode 100644
index f0233c4..0000000
--- a/res/drawable-xhdpi/bookmarks_widget_thumb_selector_longpressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/bookmarks_widget_thumb_selector_pressed.9.png b/res/drawable-xhdpi/bookmarks_widget_thumb_selector_pressed.9.png
deleted file mode 100644
index 7fb84e2..0000000
--- a/res/drawable-xhdpi/bookmarks_widget_thumb_selector_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/browser_widget_preview.png b/res/drawable-xhdpi/browser_widget_preview.png
deleted file mode 100644
index 2112b9e..0000000
--- a/res/drawable-xhdpi/browser_widget_preview.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/browsertab_add.png b/res/drawable-xhdpi/browsertab_add.png
deleted file mode 100644
index ef7603e..0000000
--- a/res/drawable-xhdpi/browsertab_add.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/browsertab_add_focused.png b/res/drawable-xhdpi/browsertab_add_focused.png
deleted file mode 100644
index 7039974..0000000
--- a/res/drawable-xhdpi/browsertab_add_focused.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/default_video_poster.png b/res/drawable-xhdpi/default_video_poster.png
deleted file mode 100644
index 5eff15c..0000000
--- a/res/drawable-xhdpi/default_video_poster.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_list_data_large.png b/res/drawable-xhdpi/ic_list_data_large.png
deleted file mode 100644
index 4047c4d..0000000
--- a/res/drawable-xhdpi/ic_list_data_large.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_list_data_off.png b/res/drawable-xhdpi/ic_list_data_off.png
deleted file mode 100644
index b508b6b..0000000
--- a/res/drawable-xhdpi/ic_list_data_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_list_data_small.png b/res/drawable-xhdpi/ic_list_data_small.png
deleted file mode 100644
index 680e69c..0000000
--- a/res/drawable-xhdpi/ic_list_data_small.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_new_window.png b/res/drawable-xhdpi/ic_menu_new_window.png
deleted file mode 100644
index 6caa148..0000000
--- a/res/drawable-xhdpi/ic_menu_new_window.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/img_notify_update.png b/res/drawable-xhdpi/img_notify_update.png
deleted file mode 100644
index 44075f5..0000000
--- a/res/drawable-xhdpi/img_notify_update.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/img_notify_update_black.png b/res/drawable-xhdpi/img_notify_update_black.png
deleted file mode 100644
index 01e7695..0000000
--- a/res/drawable-xhdpi/img_notify_update_black.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/img_notify_update_white.png b/res/drawable-xhdpi/img_notify_update_white.png
deleted file mode 100644
index be53a8a..0000000
--- a/res/drawable-xhdpi/img_notify_update_white.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/nav_tab_title_incognito.9.png b/res/drawable-xhdpi/nav_tab_title_incognito.9.png
deleted file mode 100644
index 37e8f48..0000000
--- a/res/drawable-xhdpi/nav_tab_title_incognito.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/nav_tab_title_normal.9.png b/res/drawable-xhdpi/nav_tab_title_normal.9.png
deleted file mode 100644
index 4013b06..0000000
--- a/res/drawable-xhdpi/nav_tab_title_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/overlay_url_bookmark_widget_holo.9.png b/res/drawable-xhdpi/overlay_url_bookmark_widget_holo.9.png
deleted file mode 100644
index 8bfaa63..0000000
--- a/res/drawable-xhdpi/overlay_url_bookmark_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/thumbnail_bookmarks_widget_no_bookmark_holo.png b/res/drawable-xhdpi/thumbnail_bookmarks_widget_no_bookmark_holo.png
deleted file mode 100644
index 7d24d4a..0000000
--- a/res/drawable-xhdpi/thumbnail_bookmarks_widget_no_bookmark_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/add_tab_selector.xml b/res/drawable/add_tab_selector.xml
index 4898f8f..35a0404 100644
--- a/res/drawable/add_tab_selector.xml
+++ b/res/drawable/add_tab_selector.xml
@@ -18,7 +18,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="false"
- android:drawable="@drawable/browsertab_add" />
+ android:drawable="@color/primary" />
<item android:state_focused="true"
- android:drawable="@drawable/browsertab_add_focused" />
+ android:drawable="@color/primary" />
</selector>
diff --git a/res/drawable/bookmark_thumb_selector.xml b/res/drawable/bookmark_thumb_selector.xml
index 5c04410..8222489 100644
--- a/res/drawable/bookmark_thumb_selector.xml
+++ b/res/drawable/bookmark_thumb_selector.xml
@@ -16,7 +16,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:state_pressed="false" android:drawable="@drawable/img_bookmark_card_pressed" />
- <item android:state_pressed="true" android:drawable="@drawable/img_bookmark_card_pressed" />
- <item android:drawable="@drawable/img_bookmark_card_normal" />
+ <item android:state_pressed="true" android:drawable="@color/white" />
+ <item android:drawable="@color/white" />
</selector>
-
diff --git a/res/drawable/bookmark_thumb_selector_transition.xml b/res/drawable/bookmark_thumb_selector_transition.xml
index 07ad281..bb2ab2d 100644
--- a/res/drawable/bookmark_thumb_selector_transition.xml
+++ b/res/drawable/bookmark_thumb_selector_transition.xml
@@ -15,7 +15,6 @@
-->
<transition xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/bookmarks_widget_thumb_selector_pressed" />
- <item android:drawable="@drawable/bookmarks_widget_thumb_selector_longpressed" />
+ <item android:drawable="@color/white" />
+ <item android:drawable="@color/white" />
</transition>
-
diff --git a/res/drawable/default_video_poster.xml b/res/drawable/default_video_poster.xml
new file mode 100644
index 0000000..0872499
--- /dev/null
+++ b/res/drawable/default_video_poster.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/icon_white"
+ android:pathData="M18 4l2 4h-3l-2-4h-2l2 4h-3l-2-4h-2l2 4h-3l-2-4h-1c-1.1 0-1.99 .9 -1.99 2l-.01
+12c0 1.1 .9 2 2 2h16c1.1 0 2-.9 2-2v-14h-4z" />
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+</vector>
diff --git a/res/drawable/img_notify_update.xml b/res/drawable/img_notify_update.xml
new file mode 100644
index 0000000..a450d36
--- /dev/null
+++ b/res/drawable/img_notify_update.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/icon_black"
+ android:pathData="M8 11h3v10h2v-10h3l-4-4-4 4zm-4-8v2h16v-2h-16z" />
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+</vector>
diff --git a/res/drawable/img_notify_update_white.xml b/res/drawable/img_notify_update_white.xml
new file mode 100644
index 0000000..da390df
--- /dev/null
+++ b/res/drawable/img_notify_update_white.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/icon_white"
+ android:pathData="M8 11h3v10h2v-10h3l-4-4-4 4zm-4-8v2h16v-2h-16z" />
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+</vector>
diff --git a/res/drawable/navtab_close_background.xml b/res/drawable/navtab_close_background.xml
index e20cc5c..70883c4 100644
--- a/res/drawable/navtab_close_background.xml
+++ b/res/drawable/navtab_close_background.xml
@@ -15,8 +15,7 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" android:state_pressed="false" android:drawable="@drawable/bookmarks_widget_thumb_selector_focused" />
- <item android:state_pressed="true" android:drawable="@drawable/bookmark_thumb_selector_transition" />
+ <item android:state_focused="true" android:state_pressed="false" android:drawable="@color/navtab_bg" />
+ <item android:state_pressed="true" android:drawable="@color/navtab_bg" />
<item android:drawable="@color/navtab_bg" />
</selector>
-
diff --git a/res/layout-sw600dp/snapshot_item.xml b/res/layout-sw600dp/snapshot_item.xml
index c3ce866..7fc1782 100644
--- a/res/layout-sw600dp/snapshot_item.xml
+++ b/res/layout-sw600dp/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-sw600dp/title_bar_nav.xml b/res/layout-sw600dp/title_bar_nav.xml
index d8935b3..69017c7 100644
--- a/res/layout-sw600dp/title_bar_nav.xml
+++ b/res/layout-sw600dp/title_bar_nav.xml
@@ -76,6 +76,17 @@
android:paddingEnd="6dp"
android:contentDescription="@string/page_info"/>
+ <!-- Cosmetic separator -->
+ <View
+ android:id="@+id/separator"
+ android:layout_width="1dp"
+ android:layout_height="36dp"
+ android:paddingTop="6dp"
+ android:paddingBottom="6dp"
+ android:paddingStart="4dp"
+ android:paddingEnd="4dp"
+ android:background="@color/icon_white" />
+
<com.android.browser.UrlInputView
android:id="@+id/url"
style="@style/Suggestions"
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>
diff --git a/res/raw/custom_bookmark_favicon_1.png b/res/raw/custom_bookmark_favicon_1.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_1.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_favicon_10.png b/res/raw/custom_bookmark_favicon_10.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_10.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_favicon_11.png b/res/raw/custom_bookmark_favicon_11.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_11.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_favicon_12.png b/res/raw/custom_bookmark_favicon_12.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_12.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_favicon_13.png b/res/raw/custom_bookmark_favicon_13.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_13.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_favicon_14.png b/res/raw/custom_bookmark_favicon_14.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_14.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_favicon_15.png b/res/raw/custom_bookmark_favicon_15.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_15.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_favicon_16.png b/res/raw/custom_bookmark_favicon_16.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_16.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_favicon_17.png b/res/raw/custom_bookmark_favicon_17.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_17.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_favicon_18.png b/res/raw/custom_bookmark_favicon_18.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_18.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_favicon_19.png b/res/raw/custom_bookmark_favicon_19.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_19.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_favicon_2.ico b/res/raw/custom_bookmark_favicon_2.ico
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_2.ico
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_favicon_20.png b/res/raw/custom_bookmark_favicon_20.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_20.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_favicon_3.png b/res/raw/custom_bookmark_favicon_3.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_3.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_favicon_4.ico b/res/raw/custom_bookmark_favicon_4.ico
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_4.ico
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_favicon_5.png b/res/raw/custom_bookmark_favicon_5.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_5.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_favicon_6.ico b/res/raw/custom_bookmark_favicon_6.ico
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_6.ico
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_favicon_7.png b/res/raw/custom_bookmark_favicon_7.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_7.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_favicon_8.png b/res/raw/custom_bookmark_favicon_8.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_8.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_favicon_9.png b/res/raw/custom_bookmark_favicon_9.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_favicon_9.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_1.png b/res/raw/custom_bookmark_thumb_1.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_1.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_10.png b/res/raw/custom_bookmark_thumb_10.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_10.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_11.png b/res/raw/custom_bookmark_thumb_11.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_11.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_12.png b/res/raw/custom_bookmark_thumb_12.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_12.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_13.png b/res/raw/custom_bookmark_thumb_13.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_13.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_14.png b/res/raw/custom_bookmark_thumb_14.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_14.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_15.png b/res/raw/custom_bookmark_thumb_15.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_15.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_16.png b/res/raw/custom_bookmark_thumb_16.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_16.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_17.png b/res/raw/custom_bookmark_thumb_17.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_17.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_18.png b/res/raw/custom_bookmark_thumb_18.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_18.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_19.png b/res/raw/custom_bookmark_thumb_19.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_19.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_2.png b/res/raw/custom_bookmark_thumb_2.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_2.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_20.png b/res/raw/custom_bookmark_thumb_20.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_20.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_3.png b/res/raw/custom_bookmark_thumb_3.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_3.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_4.png b/res/raw/custom_bookmark_thumb_4.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_4.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_5.png b/res/raw/custom_bookmark_thumb_5.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_5.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_6.png b/res/raw/custom_bookmark_thumb_6.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_6.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_7.png b/res/raw/custom_bookmark_thumb_7.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_7.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_8.png b/res/raw/custom_bookmark_thumb_8.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_8.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/custom_bookmark_thumb_9.png b/res/raw/custom_bookmark_thumb_9.png
deleted file mode 100644
index a190695..0000000
--- a/res/raw/custom_bookmark_thumb_9.png
+++ /dev/null
Binary files differ
diff --git a/res/xml-sw600dp/bookmarkthumbnailwidget_info.xml b/res/xml-sw600dp/bookmarkthumbnailwidget_info.xml
index 7fdcbef..b6b0407 100644
--- a/res/xml-sw600dp/bookmarkthumbnailwidget_info.xml
+++ b/res/xml-sw600dp/bookmarkthumbnailwidget_info.xml
@@ -22,7 +22,6 @@
android:minResizeHeight="40dip"
android:minResizeWidth="110dip"
android:updatePeriodMillis="0"
- android:previewImage="@drawable/browser_widget_preview"
android:initialLayout="@layout/bookmarkthumbnailwidget"
android:resizeMode="vertical|horizontal"
android:configure="com.android.browser.widget.BookmarkWidgetConfigure">
diff --git a/res/xml/bookmarkthumbnailwidget_info.xml b/res/xml/bookmarkthumbnailwidget_info.xml
index f8ca797..9a09c6c 100644
--- a/res/xml/bookmarkthumbnailwidget_info.xml
+++ b/res/xml/bookmarkthumbnailwidget_info.xml
@@ -22,7 +22,6 @@
android:minResizeHeight="40dip"
android:minResizeWidth="110dip"
android:updatePeriodMillis="0"
- android:previewImage="@drawable/browser_widget_preview"
android:initialLayout="@layout/bookmarkthumbnailwidget"
android:resizeMode="vertical|horizontal"
android:configure="com.android.browser.widget.BookmarkWidgetConfigure">
