Integrate the new star assets
Out with the old
In with the new
Bug: 8621556 integrate new Star assets for conversation list
Change-Id: Ie685317619b6f47b21d90fa2574666a1637f6db0
diff --git a/res/drawable-hdpi/ic_star_off.png b/res/drawable-hdpi/ic_star_off.png
new file mode 100644
index 0000000..4476f91
--- /dev/null
+++ b/res/drawable-hdpi/ic_star_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_star_on.png b/res/drawable-hdpi/ic_star_on.png
new file mode 100644
index 0000000..b4e7ceb
--- /dev/null
+++ b/res/drawable-hdpi/ic_star_on.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-mdpi/btn_star_off_normal_email_holo_light.png
deleted file mode 100644
index 22765e2..0000000
--- a/res/drawable-mdpi/btn_star_off_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-mdpi/btn_star_on_normal_email_holo_light.png
deleted file mode 100644
index 27338a1..0000000
--- a/res/drawable-mdpi/btn_star_on_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_star_off.png b/res/drawable-mdpi/ic_star_off.png
new file mode 100644
index 0000000..3d959ef
--- /dev/null
+++ b/res/drawable-mdpi/ic_star_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_star_on.png b/res/drawable-mdpi/ic_star_on.png
new file mode 100644
index 0000000..9f4318f
--- /dev/null
+++ b/res/drawable-mdpi/ic_star_on.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-sw600dp-hdpi/btn_star_off_normal_email_holo_light.png
deleted file mode 100644
index 1acce55..0000000
--- a/res/drawable-sw600dp-hdpi/btn_star_off_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-sw600dp-hdpi/btn_star_on_normal_email_holo_light.png
deleted file mode 100644
index 96cac8e..0000000
--- a/res/drawable-sw600dp-hdpi/btn_star_on_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-sw600dp-mdpi/btn_star_off_normal_email_holo_light.png
deleted file mode 100644
index a4d4140..0000000
--- a/res/drawable-sw600dp-mdpi/btn_star_off_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-sw600dp-mdpi/btn_star_on_normal_email_holo_light.png
deleted file mode 100644
index fb93247..0000000
--- a/res/drawable-sw600dp-mdpi/btn_star_on_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_star_off_normal_email_holo_light.png
deleted file mode 100644
index 411508b..0000000
--- a/res/drawable-sw600dp-xhdpi/btn_star_off_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_star_on_normal_email_holo_light.png
deleted file mode 100644
index e4f3f45..0000000
--- a/res/drawable-sw600dp-xhdpi/btn_star_on_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-xhdpi/btn_star_off_normal_email_holo_light.png
deleted file mode 100644
index 40e30a5..0000000
--- a/res/drawable-xhdpi/btn_star_off_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-xhdpi/btn_star_on_normal_email_holo_light.png
deleted file mode 100644
index 6666768..0000000
--- a/res/drawable-xhdpi/btn_star_on_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_star_off.png b/res/drawable-xhdpi/ic_star_off.png
new file mode 100644
index 0000000..72c50b7
--- /dev/null
+++ b/res/drawable-xhdpi/ic_star_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_star_on.png b/res/drawable-xhdpi/ic_star_on.png
new file mode 100644
index 0000000..31551a2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_star_on.png
Binary files differ
diff --git a/res/layout/conversation_item_view_normal.xml b/res/layout/conversation_item_view_normal.xml
index 6bfab15..449ee81 100644
--- a/res/layout/conversation_item_view_normal.xml
+++ b/res/layout/conversation_item_view_normal.xml
@@ -145,7 +145,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
- android:src="@drawable/btn_star_off_normal_email_holo_light" />
+ android:src="@drawable/ic_star_off" />
<!-- we assume the star asset is less than 48dp wide -->
<TextView
diff --git a/res/layout/conversation_item_view_normal_spacious.xml b/res/layout/conversation_item_view_normal_spacious.xml
index 85c90f5..ec5f369 100644
--- a/res/layout/conversation_item_view_normal_spacious.xml
+++ b/res/layout/conversation_item_view_normal_spacious.xml
@@ -145,7 +145,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
- android:src="@drawable/btn_star_off_normal_email_holo_light" />
+ android:src="@drawable/ic_star_off" />
<!-- we assume the star asset is less than 48dp wide -->
<TextView
diff --git a/res/layout/conversation_item_view_wide.xml b/res/layout/conversation_item_view_wide.xml
index 91cd747..949e964 100644
--- a/res/layout/conversation_item_view_wide.xml
+++ b/res/layout/conversation_item_view_wide.xml
@@ -142,7 +142,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="-12dp"
android:layout_marginLeft="32dp"
- android:src="@drawable/btn_star_off_normal_email_holo_light" />
+ android:src="@drawable/ic_star_off" />
</LinearLayout>
diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index be54727..4039d91 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java
@@ -342,10 +342,8 @@
if (STAR_OFF == null) {
// Initialize static bitmaps.
- STAR_OFF = BitmapFactory.decodeResource(res,
- R.drawable.btn_star_off_normal_email_holo_light);
- STAR_ON = BitmapFactory.decodeResource(res,
- R.drawable.btn_star_on_normal_email_holo_light);
+ STAR_OFF = BitmapFactory.decodeResource(res, R.drawable.ic_star_off);
+ STAR_ON = BitmapFactory.decodeResource(res, R.drawable.ic_star_on);
ATTACHMENT = BitmapFactory.decodeResource(res, R.drawable.ic_attachment_holo_light);
ONLY_TO_ME = BitmapFactory.decodeResource(res, R.drawable.ic_email_caret_double);
TO_ME_AND_OTHERS = BitmapFactory.decodeResource(res, R.drawable.ic_email_caret_single);
