am 0bf34e4f: am f6e05ba4: Use new bookmark assets.

Merge commit '0bf34e4f5f273cc55abad4f951c736d9a2e26377'

* commit '0bf34e4f5f273cc55abad4f951c736d9a2e26377':
  Use new bookmark assets.

12 files changed, 3 insertions, 3 deletions

diff --git a/res/drawable-hdpi/ic_menu_bookmarks.png b/res/drawable-hdpi/ic_menu_bookmarks.png
new file mode 100755
index 0000000..3644acf
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_bookmarks.png
diff --git a/res/drawable-hdpi/ic_tab_bookmarks_selected.png b/res/drawable-hdpi/ic_tab_bookmarks_selected.png
new file mode 100644
index 0000000..8e1c3ae
--- /dev/null
+++ b/res/drawable-hdpi/ic_tab_bookmarks_selected.png
diff --git a/res/drawable-hdpi/ic_tab_bookmarks_unselected.png b/res/drawable-hdpi/ic_tab_bookmarks_unselected.png
new file mode 100644
index 0000000..95efcb1
--- /dev/null
+++ b/res/drawable-hdpi/ic_tab_bookmarks_unselected.png
diff --git a/res/drawable-hdpi/ic_tab_browser_bookmark_selected.png b/res/drawable-hdpi/ic_tab_browser_bookmark_selected.png
deleted file mode 100644
index 30d3874..0000000
--- a/res/drawable-hdpi/ic_tab_browser_bookmark_selected.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_tab_browser_bookmark_unselected.png b/res/drawable-hdpi/ic_tab_browser_bookmark_unselected.png
deleted file mode 100644
index d0e96a0..0000000
--- a/res/drawable-hdpi/ic_tab_browser_bookmark_unselected.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_menu_bookmarks.png b/res/drawable-mdpi/ic_menu_bookmarks.png
new file mode 100755
index 0000000..1ac78b6
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_bookmarks.png
diff --git a/res/drawable-mdpi/ic_tab_bookmarks_selected.png b/res/drawable-mdpi/ic_tab_bookmarks_selected.png
new file mode 100644
index 0000000..f5e0100
--- /dev/null
+++ b/res/drawable-mdpi/ic_tab_bookmarks_selected.png
diff --git a/res/drawable-mdpi/ic_tab_bookmarks_unselected.png b/res/drawable-mdpi/ic_tab_bookmarks_unselected.png
new file mode 100644
index 0000000..598b098
--- /dev/null
+++ b/res/drawable-mdpi/ic_tab_bookmarks_unselected.png
diff --git a/res/drawable-mdpi/ic_tab_browser_bookmark_selected.png b/res/drawable-mdpi/ic_tab_browser_bookmark_selected.png
deleted file mode 100644
index 6f54305..0000000
--- a/res/drawable-mdpi/ic_tab_browser_bookmark_selected.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_tab_browser_bookmark_unselected.png b/res/drawable-mdpi/ic_tab_browser_bookmark_unselected.png
deleted file mode 100644
index 5037860..0000000
--- a/res/drawable-mdpi/ic_tab_browser_bookmark_unselected.png
+++ /dev/null
diff --git a/res/drawable/browser_bookmark_tab.xml b/res/drawable/browser_bookmark_tab.xml
index 1a42f99..49b66c7 100644
--- a/res/drawable/browser_bookmark_tab.xml
+++ b/res/drawable/browser_bookmark_tab.xml
@@ -14,8 +14,7 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Selected states are reversed because the look of tabs has changed -->
-    <item android:state_selected="false" android:drawable="@drawable/ic_tab_browser_bookmark_selected"/>
-    <item android:state_selected="true" android:drawable="@drawable/ic_tab_browser_bookmark_unselected"/>
+    <item android:state_selected="true" android:drawable="@drawable/ic_tab_bookmarks_selected"/>
+    <item android:state_selected="false" android:drawable="@drawable/ic_tab_bookmarks_unselected"/>
 </selector>
     
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index 8e2d49c..2752c3a 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -23,6 +23,7 @@
         <item android:id="@+id/bookmarks_menu_id"
             android:title="@string/bookmarks"
             android:alphabeticShortcut="b"
+            android:icon="@drawable/ic_menu_bookmarks"
             />
         <item android:id="@+id/active_tabs_menu_id"
             android:title="@string/active_tabs"