am 84a2df8e: Merge change I3c58dbaa into eclair
Merge commit '84a2df8efc941db78e78340c9e5a9e808b4eabba' into eclair-plus-aosp
* commit '84a2df8efc941db78e78340c9e5a9e808b4eabba':
New assets. This makes the title bar's button match the voice button.
diff --git a/res/drawable-hdpi/ic_btn_bookmarks.png b/res/drawable-hdpi/ic_btn_bookmarks.png
index f656a9a..092590b 100644
--- a/res/drawable-hdpi/ic_btn_bookmarks.png
+++ b/res/drawable-hdpi/ic_btn_bookmarks.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_btn_stop_v2.png b/res/drawable-hdpi/ic_btn_stop_v2.png
new file mode 100644
index 0000000..2c97223
--- /dev/null
+++ b/res/drawable-hdpi/ic_btn_stop_v2.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_btn_bookmarks.png b/res/drawable-mdpi/ic_btn_bookmarks.png
index a4981be..c307fee 100644
--- a/res/drawable-mdpi/ic_btn_bookmarks.png
+++ b/res/drawable-mdpi/ic_btn_bookmarks.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_btn_stop_v2.png b/res/drawable-mdpi/ic_btn_stop_v2.png
new file mode 100644
index 0000000..89f01e7
--- /dev/null
+++ b/res/drawable-mdpi/ic_btn_stop_v2.png
Binary files differ
diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java
index 138a68f..23b1ed5 100644
--- a/src/com/android/browser/TitleBar.java
+++ b/src/com/android/browser/TitleBar.java
@@ -239,7 +239,7 @@
mBookmarkDrawable = mRtButton.getDrawable();
}
if (mStopDrawable == null) {
- mRtButton.setImageResource(R.drawable.ic_btn_close_panel);
+ mRtButton.setImageResource(R.drawable.ic_btn_stop_v2);
mStopDrawable = mRtButton.getDrawable();
} else {
mRtButton.setImageDrawable(mStopDrawable);
