New assets
Change-Id: Ic65a3921db6d7ec18a0aa1d79bceeb26b8293158
diff --git a/res/drawable-hdpi/quickactions_icon_activated.9.png b/res/drawable-hdpi/quickactions_icon_activated.9.png
new file mode 100644
index 0000000..b9ccc80
--- /dev/null
+++ b/res/drawable-hdpi/quickactions_icon_activated.9.png
Binary files differ
diff --git a/res/drawable-hdpi/quickcontact_slider_btn_on.9.png b/res/drawable-hdpi/quickcontact_slider_btn_on.9.png
deleted file mode 100644
index ac2b496..0000000
--- a/res/drawable-hdpi/quickcontact_slider_btn_on.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/quickcontact_slider_btn_pressed.9.png b/res/drawable-hdpi/quickcontact_slider_btn_pressed.9.png
deleted file mode 100644
index d9da598..0000000
--- a/res/drawable-hdpi/quickcontact_slider_btn_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/quickcontact_slider_btn_selected.9.png b/res/drawable-hdpi/quickcontact_slider_btn_selected.9.png
deleted file mode 100644
index 72d053b..0000000
--- a/res/drawable-hdpi/quickcontact_slider_btn_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/sym_action_email_holo_light.png b/res/drawable-hdpi/sym_action_email_holo_light.png
index 166eda4..e1ff65f 100644
--- a/res/drawable-hdpi/sym_action_email_holo_light.png
+++ b/res/drawable-hdpi/sym_action_email_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/sym_action_goto_website_holo_light.png b/res/drawable-hdpi/sym_action_goto_website_holo_light.png
index 39bb2f3..4c5c614 100644
--- a/res/drawable-hdpi/sym_action_goto_website_holo_light.png
+++ b/res/drawable-hdpi/sym_action_goto_website_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/sym_action_show_map_holo_light.png b/res/drawable-hdpi/sym_action_show_map_holo_light.png
index 5ce0c64..4c6ba98 100644
--- a/res/drawable-hdpi/sym_action_show_map_holo_light.png
+++ b/res/drawable-hdpi/sym_action_show_map_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/sym_action_talk_holo_light.png b/res/drawable-hdpi/sym_action_talk_holo_light.png
new file mode 100644
index 0000000..62ad687
--- /dev/null
+++ b/res/drawable-hdpi/sym_action_talk_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/quickactions_icon_activated.9.png b/res/drawable-mdpi/quickactions_icon_activated.9.png
new file mode 100644
index 0000000..777c988
--- /dev/null
+++ b/res/drawable-mdpi/quickactions_icon_activated.9.png
Binary files differ
diff --git a/res/drawable-mdpi/quickcontact_slider_btn_on.9.png b/res/drawable-mdpi/quickcontact_slider_btn_on.9.png
deleted file mode 100644
index 330f49b..0000000
--- a/res/drawable-mdpi/quickcontact_slider_btn_on.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/quickcontact_slider_btn_pressed.9.png b/res/drawable-mdpi/quickcontact_slider_btn_pressed.9.png
deleted file mode 100644
index d4916f5..0000000
--- a/res/drawable-mdpi/quickcontact_slider_btn_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/quickcontact_slider_btn_selected.9.png b/res/drawable-mdpi/quickcontact_slider_btn_selected.9.png
deleted file mode 100644
index b910028..0000000
--- a/res/drawable-mdpi/quickcontact_slider_btn_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/sym_action_email_holo_light.png b/res/drawable-mdpi/sym_action_email_holo_light.png
index f071376..3160adb 100644
--- a/res/drawable-mdpi/sym_action_email_holo_light.png
+++ b/res/drawable-mdpi/sym_action_email_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/sym_action_goto_website_holo_light.png b/res/drawable-mdpi/sym_action_goto_website_holo_light.png
index 8b7c458..5b17bd2 100644
--- a/res/drawable-mdpi/sym_action_goto_website_holo_light.png
+++ b/res/drawable-mdpi/sym_action_goto_website_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/sym_action_show_map_holo_light.png b/res/drawable-mdpi/sym_action_show_map_holo_light.png
index 805bda1..059e821 100644
--- a/res/drawable-mdpi/sym_action_show_map_holo_light.png
+++ b/res/drawable-mdpi/sym_action_show_map_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/sym_action_talk_holo_light.png b/res/drawable-mdpi/sym_action_talk_holo_light.png
new file mode 100644
index 0000000..ff444d8
--- /dev/null
+++ b/res/drawable-mdpi/sym_action_talk_holo_light.png
Binary files differ
diff --git a/res/drawable/quickcontact_slider_btn.xml b/res/drawable/quickcontact_slider_btn.xml
index f6164df..b3d0ec7 100644
--- a/res/drawable/quickcontact_slider_btn.xml
+++ b/res/drawable/quickcontact_slider_btn.xml
@@ -16,15 +16,15 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"
android:dither="true">
- <!-- TODO: We should be using framework resources here once they are finished -->
+ <!-- TODO Still a hack. This needs a default from the framework instead for the checked state -->
<item android:state_checked="true"
- android:drawable="@drawable/quickcontact_slider_btn_on" />
+ android:drawable="@drawable/quickactions_icon_activated" />
<item android:state_window_focused="false"
android:drawable="@android:color/transparent" />
<item android:state_pressed="true"
- android:drawable="@drawable/quickcontact_slider_btn_pressed" />
+ android:drawable="@drawable/quickactions_icon_activated" />
<item android:state_focused="true"
- android:drawable="@drawable/quickcontact_slider_btn_selected" />
+ android:drawable="@drawable/quickactions_icon_activated" />
<item
android:drawable="@android:color/transparent" />
</selector>
diff --git a/src/com/android/contacts/ContactsUtils.java b/src/com/android/contacts/ContactsUtils.java
index 4dd9036..ee79dbb 100644
--- a/src/com/android/contacts/ContactsUtils.java
+++ b/src/com/android/contacts/ContactsUtils.java
@@ -293,7 +293,7 @@
return new ImActions(
new Intent(Intent.ACTION_SENDTO, Uri.parse("xmpp:" + data + "?message")),
new Intent(Intent.ACTION_SENDTO, Uri.parse("xmpp:" + data + "?call")),
- android.R.drawable.sym_action_chat,
+ R.drawable.sym_action_talk_holo_light,
R.drawable.sym_action_videochat
);
} else if ((chatCapability & Im.CAPABILITY_HAS_VOICE) != 0) {
@@ -301,14 +301,14 @@
return new ImActions(
new Intent(Intent.ACTION_SENDTO, Uri.parse("xmpp:" + data + "?message")),
new Intent(Intent.ACTION_SENDTO, Uri.parse("xmpp:" + data + "?call")),
- android.R.drawable.sym_action_chat,
+ R.drawable.sym_action_talk_holo_light,
R.drawable.sym_action_audiochat
);
} else {
return new ImActions(
new Intent(Intent.ACTION_SENDTO, Uri.parse("xmpp:" + data + "?message")),
null,
- android.R.drawable.sym_action_chat,
+ R.drawable.sym_action_talk_holo_light,
-1
);
}
@@ -328,7 +328,7 @@
return new ImActions(
new Intent(Intent.ACTION_SENDTO, imUri),
null,
- android.R.drawable.sym_action_chat,
+ R.drawable.sym_action_talk_holo_light,
-1
);
} else {
diff --git a/src/com/android/contacts/model/FallbackAccountType.java b/src/com/android/contacts/model/FallbackAccountType.java
index e30ad89..2b40634 100644
--- a/src/com/android/contacts/model/FallbackAccountType.java
+++ b/src/com/android/contacts/model/FallbackAccountType.java
@@ -299,7 +299,7 @@
DataKind kind = getKindForMimetype(Im.CONTENT_ITEM_TYPE);
if (kind == null) {
kind = addKind(new DataKind(Im.CONTENT_ITEM_TYPE, R.string.imLabelsGroup,
- android.R.drawable.sym_action_chat, 20, true));
+ R.drawable.sym_action_talk_holo_light, 20, true));
kind.actionHeader = new ImActionInflater();
kind.actionBody = new SimpleInflater(Im.DATA);
}
