am 6492a30a: am 04b025c3: Merge change 27095 into eclair

Merge commit '6492a30a25b4c61867a67b9000d90e390f7702b7'

* commit '6492a30a25b4c61867a67b9000d90e390f7702b7':
  Use new, consistent assets for adding a bookmark.

8 files changed, 4 insertions, 4 deletions

diff --git a/res/drawable-hdpi/ic_list_bookmark.png b/res/drawable-hdpi/ic_list_bookmark.png
new file mode 100644
index 0000000..13f8067
--- /dev/null
+++ b/res/drawable-hdpi/ic_list_bookmark.png
diff --git a/res/drawable-hdpi/ic_menu_add_bookmark.png b/res/drawable-hdpi/ic_menu_add_bookmark.png
new file mode 100644
index 0000000..28beaaa
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_add_bookmark.png
diff --git a/res/drawable-mdpi/ic_list_bookmark.png b/res/drawable-mdpi/ic_list_bookmark.png
new file mode 100644
index 0000000..8e75121
--- /dev/null
+++ b/res/drawable-mdpi/ic_list_bookmark.png
diff --git a/res/drawable-mdpi/ic_menu_add_bookmark.png b/res/drawable-mdpi/ic_menu_add_bookmark.png
new file mode 100644
index 0000000..3e38bb9
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_add_bookmark.png
diff --git a/res/layout/add_new_bookmark.xml b/res/layout/add_new_bookmark.xml
index bb56b93..1880e20 100644
--- a/res/layout/add_new_bookmark.xml
+++ b/res/layout/add_new_bookmark.xml
@@ -31,7 +31,7 @@
             android:layout_marginLeft="5dip"
             android:layout_marginRight="11dip"
             android:focusable="false"
-            android:src="@*android:drawable/sym_action_add"
+            android:src="@drawable/ic_list_bookmark"
             android:scaleType="fitCenter"
             />
     <LinearLayout
diff --git a/res/layout/bookmark_thumbnail.xml b/res/layout/bookmark_thumbnail.xml
index abbbb45..8dc5564 100644
--- a/res/layout/bookmark_thumbnail.xml
+++ b/res/layout/bookmark_thumbnail.xml
@@ -44,7 +44,7 @@
         <ImageView
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:src="@drawable/ic_tab_browser_bookmark_selected"
+            android:src="@drawable/ic_list_bookmark"
             />
         <TextView
             android:layout_height="wrap_content"
diff --git a/res/menu/bookmarks.xml b/res/menu/bookmarks.xml
index f768c98..a8781c2 100644
--- a/res/menu/bookmarks.xml
+++ b/res/menu/bookmarks.xml
@@ -16,7 +16,7 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/new_context_menu_id"
-        android:icon="@android:drawable/ic_menu_add"
+        android:icon="@drawable/ic_menu_add_bookmark"
         android:title="@string/bookmark_page" />
     <item android:id="@+id/switch_mode_menu_id"
         />
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index 4a73261..b408988 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -32,7 +32,7 @@
             android:icon="@*android:drawable/ic_menu_forward" />
         <item android:id="@+id/add_bookmark_menu_id"
             android:title="@string/save_to_bookmarks"
-            android:icon="@drawable/ic_menu_bookmark"
+            android:icon="@drawable/ic_menu_add_bookmark"
             android:alphabeticShortcut="a" />
         <item android:id="@+id/find_menu_id"
             android:title="@string/find_dot"